AVR: add 16-bit & 32-bit register accessors.

Signed-off-by: Glenn Baker <[email protected]>

Author: glennsec

include/unicorn/avr.h

@@ -105,13 +105,81 @@ typedef enum uc_avr_reg {
     UC_AVR_REG_SPH,
     UC_AVR_REG_SREG,
 
+    //> 16-bit coalesced registers
+    UC_AVR_REG_R0W = UC_AVR_REG_PC + 32,
+    UC_AVR_REG_R1W,
+    UC_AVR_REG_R2W,
+    UC_AVR_REG_R3W,
+    UC_AVR_REG_R4W,
+    UC_AVR_REG_R5W,
+    UC_AVR_REG_R6W,
+    UC_AVR_REG_R7W,
+    UC_AVR_REG_R8W,
+    UC_AVR_REG_R9W,
+    UC_AVR_REG_R10W,
+    UC_AVR_REG_R11W,
+    UC_AVR_REG_R12W,
+    UC_AVR_REG_R13W,
+    UC_AVR_REG_R14W,
+    UC_AVR_REG_R15W,
+    UC_AVR_REG_R16W,
+    UC_AVR_REG_R17W,
+    UC_AVR_REG_R18W,
+    UC_AVR_REG_R19W,
+    UC_AVR_REG_R20W,
+    UC_AVR_REG_R21W,
+    UC_AVR_REG_R22W,
+    UC_AVR_REG_R23W,
+    UC_AVR_REG_R24W,
+    UC_AVR_REG_R25W,
+    UC_AVR_REG_R26W,
+    UC_AVR_REG_R27W,
+    UC_AVR_REG_R28W,
+    UC_AVR_REG_R29W,
+    UC_AVR_REG_R30W,
+
+    //> 32-bit coalesced registers
+    UC_AVR_REG_R0D = UC_AVR_REG_PC + 64,
+    UC_AVR_REG_R1D,
+    UC_AVR_REG_R2D,
+    UC_AVR_REG_R3D,
+    UC_AVR_REG_R4D,
+    UC_AVR_REG_R5D,
+    UC_AVR_REG_R6D,
+    UC_AVR_REG_R7D,
+    UC_AVR_REG_R8D,
+    UC_AVR_REG_R9D,
+    UC_AVR_REG_R10D,
+    UC_AVR_REG_R11D,
+    UC_AVR_REG_R12D,
+    UC_AVR_REG_R13D,
+    UC_AVR_REG_R14D,
+    UC_AVR_REG_R15D,
+    UC_AVR_REG_R16D,
+    UC_AVR_REG_R17D,
+    UC_AVR_REG_R18D,
+    UC_AVR_REG_R19D,
+    UC_AVR_REG_R20D,
+    UC_AVR_REG_R21D,
+    UC_AVR_REG_R22D,
+    UC_AVR_REG_R23D,
+    UC_AVR_REG_R24D,
+    UC_AVR_REG_R25D,
+    UC_AVR_REG_R26D,
+    UC_AVR_REG_R27D,
+    UC_AVR_REG_R28D,
+
     //> Alias registers
     UC_AVR_REG_Xhi = UC_AVR_REG_R27,
     UC_AVR_REG_Xlo = UC_AVR_REG_R26,
     UC_AVR_REG_Yhi = UC_AVR_REG_R29,
     UC_AVR_REG_Ylo = UC_AVR_REG_R28,
     UC_AVR_REG_Zhi = UC_AVR_REG_R31,
     UC_AVR_REG_Zlo = UC_AVR_REG_R30,
+
+    UC_AVR_REG_X = UC_AVR_REG_R26W,
+    UC_AVR_REG_Y = UC_AVR_REG_R28W,
+    UC_AVR_REG_Z = UC_AVR_REG_R30W,
 } uc_avr_reg;
 
 #ifdef __cplusplus

qemu/target/avr/unicorn.c

@@ -80,12 +80,26 @@ static void reg_read(CPUAVRState *env, unsigned int regid, void *value)
         *(uint8_t *)value = cpu_get_sreg(env);
         break;
 
-    default:
+    default: {
+        uint64_t v = 0;
         if (regid >= UC_AVR_REG_R0 && regid <= UC_AVR_REG_R31) {
             *(int8_t *)value = (int8_t)env->r[regid - UC_AVR_REG_R0];
         }
+        else if (regid >= UC_AVR_REG_R0W && regid <= UC_AVR_REG_R30W) {
+            const uint32_t *const r = &env->r[regid - UC_AVR_REG_R0W];
+            for (int k = 0; k < 2; k++)
+                SET_BYTE(v, k, (r[k] & 0xff));
+            *(int16_t *)value = (int16_t)v;
+        }
+        else if (regid >= UC_AVR_REG_R0D && regid <= UC_AVR_REG_R28D) {
+            const uint32_t *const r = &env->r[regid - UC_AVR_REG_R0D];
+            for (int k = 0; k < 4; k++)
+                SET_BYTE(v, k, (r[k] & 0xff));
+            *(int32_t *)value = (int32_t)v;
+        }
         break;
     }
+    }
 }
 
 int avr_reg_read(struct uc_struct *uc, unsigned int *regs, void **vals,
@@ -154,10 +168,30 @@ static void reg_write(CPUAVRState *env, unsigned int regid,
         cpu_set_sreg(env, *(uint8_t *)value);
         break;
 
-    default:
+    default: {
+        uint64_t v;
+        uint32_t *r = NULL;
+        int rlen = 0;
         if (regid >= UC_AVR_REG_R0 && regid <= UC_AVR_REG_R31) {
-            env->r[regid - UC_AVR_REG_R0] = *(uint8_t *)value;
+            v = *(uint8_t *)value;
+            r = &env->r[regid - UC_AVR_REG_R0];
+            rlen = 1;
+        }
+        else if (regid >= UC_AVR_REG_R0W && regid <= UC_AVR_REG_R30W) {
+            v = *(uint16_t *)value;
+            r = &env->r[regid - UC_AVR_REG_R0W];
+            rlen = 2;
         }
+        else if (regid >= UC_AVR_REG_R0D && regid <= UC_AVR_REG_R28D) {
+            v = *(uint32_t *)value;
+            r = &env->r[regid - UC_AVR_REG_R0D];
+            rlen = 4;
+        }
+        if (r && rlen > 0) {
+            for (int k = 0; k < rlen; k++)
+                r[k] = GET_BYTE(v, k);
+        }
+    }
     }
 }