[PATCH 06/27] sim: avr: invert sim_cpu storage

[Mike Frysinger <vapier@gentoo.org>]

---
 sim/avr/interp.c   | 201 +++++++++++++++++++++++----------------------
 sim/avr/sim-main.h |   8 +-
 2 files changed, 110 insertions(+), 99 deletions(-)

diff --git a/sim/avr/interp.c b/sim/avr/interp.c
index 0aa7132cf779..9720611320cb 100644
--- a/sim/avr/interp.c
+++ b/sim/avr/interp.c
@@ -729,19 +729,20 @@ static void
 do_call (SIM_CPU *cpu, unsigned int npc)
 {
   const struct avr_sim_state *state = AVR_SIM_STATE (CPU_STATE (cpu));
+  struct avr_sim_cpu *avr_cpu = AVR_SIM_CPU (cpu);
   unsigned int sp = read_word (REG_SP);
 
   /* Big endian!  */
-  sram[sp--] = cpu->pc;
-  sram[sp--] = cpu->pc >> 8;
+  sram[sp--] = avr_cpu->pc;
+  sram[sp--] = avr_cpu->pc >> 8;
   if (state->avr_pc22)
     {
-      sram[sp--] = cpu->pc >> 16;
-      cpu->cycles++;
+      sram[sp--] = avr_cpu->pc >> 16;
+      avr_cpu->cycles++;
     }
   write_word (REG_SP, sp);
-  cpu->pc = npc & PC_MASK;
-  cpu->cycles += 3;
+  avr_cpu->pc = npc & PC_MASK;
+  avr_cpu->cycles += 3;
 }
 
 static int
@@ -775,18 +776,21 @@ get_lpm (unsigned int addr)
 static void
 gen_mul (SIM_CPU *cpu, unsigned int res)
 {
+  struct avr_sim_cpu *avr_cpu = AVR_SIM_CPU (cpu);
+
   write_word (0, res);
   sram[SREG] &= ~(SREG_Z | SREG_C);
   if (res == 0)
     sram[SREG] |= SREG_Z;
   if (res & 0x8000)
     sram[SREG] |= SREG_C;
-  cpu->cycles++;
+  avr_cpu->cycles++;
 }
 
 static void
 step_once (SIM_CPU *cpu)
 {
+  struct avr_sim_cpu *avr_cpu = AVR_SIM_CPU (cpu);
   unsigned int ipc;
 
   int code;
@@ -795,8 +799,8 @@ step_once (SIM_CPU *cpu)
   byte r, d, vd;
 
  again:
-  code = flash[cpu->pc].code;
-  op = flash[cpu->pc].op;
+  code = flash[avr_cpu->pc].code;
+  op = flash[avr_cpu->pc].op;
 
 #if 0
       if (tracing && code != OP_unknown)
@@ -829,27 +833,27 @@ step_once (SIM_CPU *cpu)
 	  }
 
 	  if (!tracing)
-	    sim_cb_eprintf (callback, "%06x: %04x\n", 2 * cpu->pc, flash[cpu->pc].op);
+	    sim_cb_eprintf (callback, "%06x: %04x\n", 2 * avr_cpu->pc, flash[avr_cpu->pc].op);
 	  else
 	    {
 	      sim_cb_eprintf (callback, "pc=0x%06x insn=0x%04x code=%d r=%d\n",
-                              2 * cpu->pc, flash[cpu->pc].op, code, flash[cpu->pc].r);
-	      disassemble_insn (CPU_STATE (cpu), cpu->pc);
+                              2 * avr_cpu->pc, flash[avr_cpu->pc].op, code, flash[avr_cpu->pc].r);
+	      disassemble_insn (CPU_STATE (cpu), avr_cpu->pc);
 	      sim_cb_eprintf (callback, "\n");
 	    }
 	}
 #endif
 
-  ipc = cpu->pc;
-  cpu->pc = (cpu->pc + 1) & PC_MASK;
-  cpu->cycles++;
+  ipc = avr_cpu->pc;
+  avr_cpu->pc = (avr_cpu->pc + 1) & PC_MASK;
+  avr_cpu->cycles++;
 
   switch (code)
     {
       case OP_unknown:
 	flash[ipc].code = decode(ipc);
-	cpu->pc = ipc;
-	cpu->cycles--;
+	avr_cpu->pc = ipc;
+	avr_cpu->cycles--;
 	goto again;
 
       case OP_nop:
@@ -857,23 +861,23 @@ step_once (SIM_CPU *cpu)
 
       case OP_jmp:
 	/* 2 words instruction, but we don't care about the pc.  */
-	cpu->pc = ((flash[ipc].r << 16) | flash[ipc + 1].op) & PC_MASK;
-	cpu->cycles += 2;
+	avr_cpu->pc = ((flash[ipc].r << 16) | flash[ipc + 1].op) & PC_MASK;
+	avr_cpu->cycles += 2;
 	break;
 
       case OP_eijmp:
-	cpu->pc = ((sram[EIND] << 16) | read_word (REGZ)) & PC_MASK;
-	cpu->cycles += 2;
+	avr_cpu->pc = ((sram[EIND] << 16) | read_word (REGZ)) & PC_MASK;
+	avr_cpu->cycles += 2;
 	break;
 
       case OP_ijmp:
-	cpu->pc = read_word (REGZ) & PC_MASK;
-	cpu->cycles += 1;
+	avr_cpu->pc = read_word (REGZ) & PC_MASK;
+	avr_cpu->cycles += 1;
 	break;
 
       case OP_call:
 	/* 2 words instruction.  */
-	cpu->pc++;
+	avr_cpu->pc++;
 	do_call (cpu, (flash[ipc].r << 16) | flash[ipc + 1].op);
 	break;
 
@@ -886,7 +890,7 @@ step_once (SIM_CPU *cpu)
 	break;
 
       case OP_rcall:
-	do_call (cpu, cpu->pc + sign_ext (op & 0xfff, 12));
+	do_call (cpu, avr_cpu->pc + sign_ext (op & 0xfff, 12));
 	break;
 
       case OP_reti:
@@ -898,16 +902,16 @@ step_once (SIM_CPU *cpu)
 	  unsigned int sp = read_word (REG_SP);
 	  if (state->avr_pc22)
 	    {
-	      cpu->pc = sram[++sp] << 16;
-	      cpu->cycles++;
+	      avr_cpu->pc = sram[++sp] << 16;
+	      avr_cpu->cycles++;
 	    }
 	  else
-	    cpu->pc = 0;
-	  cpu->pc |= sram[++sp] << 8;
-	  cpu->pc |= sram[++sp];
+	    avr_cpu->pc = 0;
+	  avr_cpu->pc |= sram[++sp] << 8;
+	  avr_cpu->pc |= sram[++sp];
 	  write_word (REG_SP, sp);
 	}
-	cpu->cycles += 3;
+	avr_cpu->cycles += 3;
 	break;
 
       case OP_break:
@@ -935,9 +939,9 @@ step_once (SIM_CPU *cpu)
       case OP_sbrs:
 	if (((sram[get_d (op)] & flash[ipc].r) == 0) ^ ((op & 0x0200) != 0))
 	  {
-	    int l = get_insn_length (cpu->pc);
-	    cpu->pc += l;
-	    cpu->cycles += l;
+	    int l = get_insn_length (avr_cpu->pc);
+	    avr_cpu->pc += l;
+	    avr_cpu->cycles += l;
 	  }
 	break;
 
@@ -947,7 +951,7 @@ step_once (SIM_CPU *cpu)
 	  sram[sp--] = sram[get_d (op)];
 	  write_word (REG_SP, sp);
 	}
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_pop:
@@ -956,7 +960,7 @@ step_once (SIM_CPU *cpu)
 	  sram[get_d (op)] = sram[++sp];
 	  write_word (REG_SP, sp);
 	}
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_bclr:
@@ -968,8 +972,8 @@ step_once (SIM_CPU *cpu)
 	break;
 
       case OP_rjmp:
-	cpu->pc = (cpu->pc + sign_ext (op & 0xfff, 12)) & PC_MASK;
-	cpu->cycles++;
+	avr_cpu->pc = (avr_cpu->pc + sign_ext (op & 0xfff, 12)) & PC_MASK;
+	avr_cpu->cycles++;
 	break;
 
       case OP_eor:
@@ -1206,9 +1210,9 @@ step_once (SIM_CPU *cpu)
 	if (d == STDIO_PORT)
 	  putchar (res);
 	else if (d == EXIT_PORT)
-	  sim_engine_halt (CPU_STATE (cpu), cpu, NULL, cpu->pc, sim_exited, 0);
+	  sim_engine_halt (CPU_STATE (cpu), cpu, NULL, avr_cpu->pc, sim_exited, 0);
 	else if (d == ABORT_PORT)
-	  sim_engine_halt (CPU_STATE (cpu), cpu, NULL, cpu->pc, sim_exited, 1);
+	  sim_engine_halt (CPU_STATE (cpu), cpu, NULL, avr_cpu->pc, sim_exited, 1);
 	break;
 
       case OP_in:
@@ -1229,18 +1233,18 @@ step_once (SIM_CPU *cpu)
       case OP_sbic:
 	if (!(sram[get_biA (op) + 0x20] & 1 << get_b(op)))
 	  {
-	    int l = get_insn_length (cpu->pc);
-	    cpu->pc += l;
-	    cpu->cycles += l;
+	    int l = get_insn_length (avr_cpu->pc);
+	    avr_cpu->pc += l;
+	    avr_cpu->cycles += l;
 	  }
 	break;
 
       case OP_sbis:
 	if (sram[get_biA (op) + 0x20] & 1 << get_b(op))
 	  {
-	    int l = get_insn_length (cpu->pc);
-	    cpu->pc += l;
-	    cpu->cycles += l;
+	    int l = get_insn_length (avr_cpu->pc);
+	    avr_cpu->pc += l;
+	    avr_cpu->cycles += l;
 	  }
 	break;
 
@@ -1251,23 +1255,23 @@ step_once (SIM_CPU *cpu)
 	break;
 
       case OP_lds:
-	sram[get_d (op)] = sram[flash[cpu->pc].op];
-	cpu->pc++;
-	cpu->cycles++;
+	sram[get_d (op)] = sram[flash[avr_cpu->pc].op];
+	avr_cpu->pc++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_sts:
-	sram[flash[cpu->pc].op] = sram[get_d (op)];
-	cpu->pc++;
-	cpu->cycles++;
+	sram[flash[avr_cpu->pc].op] = sram[get_d (op)];
+	avr_cpu->pc++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_cpse:
 	if (sram[get_r (op)] == sram[get_d (op)])
 	  {
-	    int l = get_insn_length (cpu->pc);
-	    cpu->pc += l;
-	    cpu->cycles += l;
+	    int l = get_insn_length (avr_cpu->pc);
+	    avr_cpu->pc += l;
+	    avr_cpu->cycles += l;
 	  }
 	break;
 
@@ -1304,42 +1308,42 @@ step_once (SIM_CPU *cpu)
       case OP_brbc:
 	if (!(sram[SREG] & flash[ipc].r))
 	  {
-	    cpu->pc = (cpu->pc + get_k (op)) & PC_MASK;
-	    cpu->cycles++;
+	    avr_cpu->pc = (avr_cpu->pc + get_k (op)) & PC_MASK;
+	    avr_cpu->cycles++;
 	  }
 	break;
 
       case OP_brbs:
 	if (sram[SREG] & flash[ipc].r)
 	  {
-	    cpu->pc = (cpu->pc + get_k (op)) & PC_MASK;
-	    cpu->cycles++;
+	    avr_cpu->pc = (avr_cpu->pc + get_k (op)) & PC_MASK;
+	    avr_cpu->cycles++;
 	  }
 	break;
 
       case OP_lpm:
 	sram[0] = get_lpm (read_word (REGZ));
-	cpu->cycles += 2;
+	avr_cpu->cycles += 2;
 	break;
 
       case OP_lpm_Z:
 	sram[get_d (op)] = get_lpm (read_word (REGZ));
-	cpu->cycles += 2;
+	avr_cpu->cycles += 2;
 	break;
 
       case OP_lpm_inc_Z:
 	sram[get_d (op)] = get_lpm (read_word_post_inc (REGZ));
-	cpu->cycles += 2;
+	avr_cpu->cycles += 2;
 	break;
 
       case OP_elpm:
 	sram[0] = get_lpm (get_z ());
-	cpu->cycles += 2;
+	avr_cpu->cycles += 2;
 	break;
 
       case OP_elpm_Z:
 	sram[get_d (op)] = get_lpm (get_z ());
-	cpu->cycles += 2;
+	avr_cpu->cycles += 2;
 	break;
 
       case OP_elpm_inc_Z:
@@ -1352,97 +1356,97 @@ step_once (SIM_CPU *cpu)
 	  sram[REGZ_HI] = z >> 8;
 	  sram[RAMPZ] = z >> 16;
 	}
-	cpu->cycles += 2;
+	avr_cpu->cycles += 2;
 	break;
 
       case OP_ld_Z_inc:
 	sram[get_d (op)] = sram[read_word_post_inc (REGZ) & SRAM_MASK];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_ld_dec_Z:
 	sram[get_d (op)] = sram[read_word_pre_dec (REGZ) & SRAM_MASK];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_ld_X_inc:
 	sram[get_d (op)] = sram[read_word_post_inc (REGX) & SRAM_MASK];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_ld_dec_X:
 	sram[get_d (op)] = sram[read_word_pre_dec (REGX) & SRAM_MASK];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_ld_Y_inc:
 	sram[get_d (op)] = sram[read_word_post_inc (REGY) & SRAM_MASK];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_ld_dec_Y:
 	sram[get_d (op)] = sram[read_word_pre_dec (REGY) & SRAM_MASK];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_st_X:
 	sram[read_word (REGX) & SRAM_MASK] = sram[get_d (op)];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_st_X_inc:
 	sram[read_word_post_inc (REGX) & SRAM_MASK] = sram[get_d (op)];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_st_dec_X:
 	sram[read_word_pre_dec (REGX) & SRAM_MASK] = sram[get_d (op)];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_st_Z_inc:
 	sram[read_word_post_inc (REGZ) & SRAM_MASK] = sram[get_d (op)];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_st_dec_Z:
 	sram[read_word_pre_dec (REGZ) & SRAM_MASK] = sram[get_d (op)];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_st_Y_inc:
 	sram[read_word_post_inc (REGY) & SRAM_MASK] = sram[get_d (op)];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_st_dec_Y:
 	sram[read_word_pre_dec (REGY) & SRAM_MASK] = sram[get_d (op)];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_std_Y:
 	sram[read_word (REGY) + flash[ipc].r] = sram[get_d (op)];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_std_Z:
 	sram[read_word (REGZ) + flash[ipc].r] = sram[get_d (op)];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_ldd_Z:
 	sram[get_d (op)] = sram[read_word (REGZ) + flash[ipc].r];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_ldd_Y:
 	sram[get_d (op)] = sram[read_word (REGY) + flash[ipc].r];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_ld_X:
 	sram[get_d (op)] = sram[read_word (REGX) & SRAM_MASK];
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_sbiw:
@@ -1468,7 +1472,7 @@ step_once (SIM_CPU *cpu)
 	    sram[SREG] |= SREG_S;
 	  write_word (d, wres);
 	}
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_adiw:
@@ -1494,14 +1498,14 @@ step_once (SIM_CPU *cpu)
 	    sram[SREG] |= SREG_S;
 	  write_word (d, wres);
 	}
-	cpu->cycles++;
+	avr_cpu->cycles++;
 	break;
 
       case OP_bad:
-	sim_engine_halt (CPU_STATE (cpu), cpu, NULL, cpu->pc, sim_signalled, SIM_SIGILL);
+	sim_engine_halt (CPU_STATE (cpu), cpu, NULL, avr_cpu->pc, sim_signalled, SIM_SIGILL);
 
       default:
-	sim_engine_halt (CPU_STATE (cpu), cpu, NULL, cpu->pc, sim_signalled, SIM_SIGILL);
+	sim_engine_halt (CPU_STATE (cpu), cpu, NULL, avr_cpu->pc, sim_signalled, SIM_SIGILL);
       }
 }
 
@@ -1602,6 +1606,8 @@ sim_read (SIM_DESC sd, SIM_ADDR addr, void *buffer, int size)
 static int
 avr_reg_store (SIM_CPU *cpu, int rn, const unsigned char *memory, int length)
 {
+  struct avr_sim_cpu *avr_cpu = AVR_SIM_CPU (cpu);
+
   if (rn < 32 && length == 1)
     {
       sram[rn] = *memory;
@@ -1620,9 +1626,9 @@ avr_reg_store (SIM_CPU *cpu, int rn, const unsigned char *memory, int length)
     }
   if (rn == AVR_PC_REGNUM && length == 4)
     {
-      cpu->pc = (memory[0] >> 1) | (memory[1] << 7)
+      avr_cpu->pc = (memory[0] >> 1) | (memory[1] << 7)
 		| (memory[2] << 15) | (memory[3] << 23);
-      cpu->pc &= PC_MASK;
+      avr_cpu->pc &= PC_MASK;
       return 4;
     }
   return 0;
@@ -1631,6 +1637,8 @@ avr_reg_store (SIM_CPU *cpu, int rn, const unsigned char *memory, int length)
 static int
 avr_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
 {
+  struct avr_sim_cpu *avr_cpu = AVR_SIM_CPU (cpu);
+
   if (rn < 32 && length == 1)
     {
       *memory = sram[rn];
@@ -1649,10 +1657,10 @@ avr_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
     }
   if (rn == AVR_PC_REGNUM && length == 4)
     {
-      memory[0] = cpu->pc << 1;
-      memory[1] = cpu->pc >> 7;
-      memory[2] = cpu->pc >> 15;
-      memory[3] = cpu->pc >> 23;
+      memory[0] = avr_cpu->pc << 1;
+      memory[1] = avr_cpu->pc >> 7;
+      memory[2] = avr_cpu->pc >> 15;
+      memory[3] = avr_cpu->pc >> 23;
       return 4;
     }
   return 0;
@@ -1661,13 +1669,13 @@ avr_reg_fetch (SIM_CPU *cpu, int rn, unsigned char *memory, int length)
 static sim_cia
 avr_pc_get (sim_cpu *cpu)
 {
-  return cpu->pc;
+  return AVR_SIM_CPU (cpu)->pc;
 }
 
 static void
 avr_pc_set (sim_cpu *cpu, sim_cia pc)
 {
-  cpu->pc = pc;
+  AVR_SIM_CPU (cpu)->pc = pc;
 }
 
 static void
@@ -1692,7 +1700,8 @@ sim_open (SIM_OPEN_KIND kind, host_callback *cb,
   current_target_byte_order = BFD_ENDIAN_LITTLE;
 
   /* The cpu data is kept in a separately allocated chunk of memory.  */
-  if (sim_cpu_alloc_all (sd, 1) != SIM_RC_OK)
+  if (sim_cpu_alloc_all_extra (sd, 1, sizeof (struct avr_sim_cpu))
+      != SIM_RC_OK)
     {
       free_state (sd);
       return 0;
diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h
index c58717a75508..63f43dded5fc 100644
--- a/sim/avr/sim-main.h
+++ b/sim/avr/sim-main.h
@@ -19,20 +19,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #ifndef SIM_MAIN_H
 #define SIM_MAIN_H
 
+#define SIM_HAVE_COMMON_SIM_CPU
+
 #include "sim-basics.h"
 
 #include "sim-base.h"
 
-struct _sim_cpu {
+struct avr_sim_cpu {
   /* The only real register.  */
   uint32_t pc;
 
   /* We update a cycle counter.  */
   uint32_t cycles;
-
-  sim_cpu_base base;
 };
 
+#define AVR_SIM_CPU(cpu) ((struct avr_sim_cpu *) CPU_ARCH_DATA (cpu))
+
 struct avr_sim_state {
   /* If true, the pc needs more than 2 bytes.  */
   int avr_pc22;
-- 
2.37.3