Fix nasty bug in word and bytewise register access

vintagepc · vintagepc · commit 74c513d7c139 · 2021-12-07T21:13:54.000-05:00
diff --git a/hw/arm/prusa/stm32f407/stm32f2xx_flashint.c b/hw/arm/prusa/stm32f407/stm32f2xx_flashint.c
@@ -53,7 +53,7 @@ static void
 stm32f2xx_fint_write(void *arg, hwaddr addr, uint64_t data, unsigned int size)
 {
     stm32f2xx_fint *s = arg;
-    int offset = addr % 3;
+    int offset = addr & 0x03;
 
     addr >>= 2;
     if (addr > STM32_FINT_MAX) {
diff --git a/hw/arm/prusa/stm32f407/stm32f2xx_gpio.c b/hw/arm/prusa/stm32f407/stm32f2xx_gpio.c
@@ -96,7 +96,7 @@ static void
 stm32f2xx_gpio_write(void *arg, hwaddr addr, uint64_t data, unsigned int size)
 {
     stm32f2xx_gpio *s = arg;
-    int offset = addr % 3;
+    int offset = addr & 0x03;
 
     addr >>= 2;
     if (addr > STM32_GPIO_MAX) {
diff --git a/hw/arm/prusa/stm32f407/stm32f4xx_itm.c b/hw/arm/prusa/stm32f407/stm32f4xx_itm.c
@@ -53,7 +53,7 @@ static void
 stm32f4xx_itm_write(void *arg, hwaddr addr, uint64_t data, unsigned int size)
 {
     stm32f4xx_itm *s = arg;
-    int offset = addr % 3;  
+    int offset = addr & 0x03;  
 
     addr >>= 2;
     if (addr > R_ITM_MAX) {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ static void`
`53`	`53`	`stm32f2xx_fint_write(void *arg, hwaddr addr, uint64_t data, unsigned int size)`
`54`	`54`	`{`
`55`	`55`	`stm32f2xx_fint *s = arg;`
`56`		`- int offset = addr % 3;`
	`56`	`+ int offset = addr & 0x03;`
`57`	`57`
`58`	`58`	`addr >>= 2;`
`59`	`59`	`if (addr > STM32_FINT_MAX) {`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ static void`
`96`	`96`	`stm32f2xx_gpio_write(void *arg, hwaddr addr, uint64_t data, unsigned int size)`
`97`	`97`	`{`
`98`	`98`	`stm32f2xx_gpio *s = arg;`
`99`		`- int offset = addr % 3;`
	`99`	`+ int offset = addr & 0x03;`
`100`	`100`
`101`	`101`	`addr >>= 2;`
`102`	`102`	`if (addr > STM32_GPIO_MAX) {`