-#define CPU_TYPE m68ki_cpu.cpu_type
-
-#define REG_DA m68ki_cpu.dar /* easy access to data and address regs */
-#define REG_DA_SAVE m68ki_cpu.dar_save
-#define REG_D m68ki_cpu.dar
-#define REG_A (m68ki_cpu.dar+8)
-#define REG_PPC m68ki_cpu.ppc
-#define REG_PC m68ki_cpu.pc
-#define REG_SP_BASE m68ki_cpu.sp
-#define REG_USP m68ki_cpu.sp[0]
-#define REG_ISP m68ki_cpu.sp[4]
-#define REG_MSP m68ki_cpu.sp[6]
-#define REG_SP m68ki_cpu.dar[15]
-#define REG_VBR m68ki_cpu.vbr
-#define REG_SFC m68ki_cpu.sfc
-#define REG_DFC m68ki_cpu.dfc
-#define REG_CACR m68ki_cpu.cacr
-#define REG_CAAR m68ki_cpu.caar
-#define REG_IR m68ki_cpu.ir
-
-#define REG_FP m68ki_cpu.fpr
-#define REG_FPCR m68ki_cpu.fpcr
-#define REG_FPSR m68ki_cpu.fpsr
-#define REG_FPIAR m68ki_cpu.fpiar
-
-#define FLAG_T1 m68ki_cpu.t1_flag
-#define FLAG_T0 m68ki_cpu.t0_flag
-#define FLAG_S m68ki_cpu.s_flag
-#define FLAG_M m68ki_cpu.m_flag
-#define FLAG_X m68ki_cpu.x_flag
-#define FLAG_N m68ki_cpu.n_flag
-#define FLAG_Z m68ki_cpu.not_z_flag
-#define FLAG_V m68ki_cpu.v_flag
-#define FLAG_C m68ki_cpu.c_flag
-#define FLAG_INT_MASK m68ki_cpu.int_mask
+#define CPU_TYPE state->cpu_type
+
+#define REG_DA state->dar /* easy access to data and address regs */
+#define REG_DA_SAVE state->dar_save
+#define REG_D state->dar
+#define REG_A (state->dar+8)
+#define REG_PPC state->ppc
+#define REG_PC state->pc
+#define REG_SP_BASE state->sp
+#define REG_USP state->sp[0]
+#define REG_ISP state->sp[4]
+#define REG_MSP state->sp[6]
+#define REG_SP state->dar[15]
+#define REG_VBR state->vbr
+#define REG_SFC state->sfc
+#define REG_DFC state->dfc
+#define REG_CACR state->cacr
+#define REG_CAAR state->caar
+#define REG_IR state->ir
+
+#define REG_FP state->fpr
+#define REG_FPCR state->fpcr
+#define REG_FPSR state->fpsr
+#define REG_FPIAR state->fpiar
+
+#define FLAG_T1 state->t1_flag
+#define FLAG_T0 state->t0_flag
+#define FLAG_S state->s_flag
+#define FLAG_M state->m_flag
+#define FLAG_X state->x_flag
+#define FLAG_N state->n_flag
+#define FLAG_Z state->not_z_flag
+#define FLAG_V state->v_flag
+#define FLAG_C state->c_flag
+#define FLAG_INT_MASK state->int_mask