--- nono/m680x0/m68030ea.h 2026/04/29 17:05:15 1.1.1.3 +++ nono/m680x0/m68030ea.h 2026/04/29 17:05:26 1.1.1.4 @@ -17,15 +17,14 @@ // MOVE の DST 側からも呼ばれる。 // (An) - inline uint32 internal_ea_anin(int n) + inline uint32 internal_ea_anin(uint n) { return reg.A[n]; } // (An)+ .B - inline uint32 internal_ea_anpi_8(int n) + inline uint32 internal_ea_anpi_1(uint n) { - save_reg_pi(n); if (n == 7) { reg.A[n] += 2; return reg.A[n] - 2; @@ -36,25 +35,22 @@ } // (An)+ .W - inline uint32 internal_ea_anpi_16(int n) + inline uint32 internal_ea_anpi_2(uint n) { - save_reg_pi(n); reg.A[n] += 2; return reg.A[n] - 2; } // (An)+ .L - inline uint32 internal_ea_anpi_32(int n) + inline uint32 internal_ea_anpi_4(uint n) { - save_reg_pi(n); reg.A[n] += 4; return reg.A[n] - 4; } // -(An) .B - inline uint32 internal_ea_anpd_8(int n) + inline uint32 internal_ea_anpd_1(uint n) { - save_reg_pd(n); if (n == 7) { reg.A[n] -= 2; } else { @@ -64,30 +60,28 @@ } // -(An) .W - inline uint32 internal_ea_anpd_16(int n) + inline uint32 internal_ea_anpd_2(uint n) { - save_reg_pd(n); reg.A[n] -= 2; return reg.A[n]; } // -(An) .L - inline uint32 internal_ea_anpd_32(int n) + inline uint32 internal_ea_anpd_4(uint n) { - save_reg_pd(n); reg.A[n] -= 4; return reg.A[n]; } // d16(An) - inline uint32 internal_ea_andi(int n) + inline uint32 internal_ea_andi(uint n) { - int32 disp = (int32)(int16)fetch_16(); + int32 disp = (int32)(int16)fetch_2(); return reg.A[n] + disp; } // (An,IX) - inline uint32 internal_ea_anix(int n) + inline uint32 internal_ea_anix(uint n) { return internal_ea_ix(reg.A[n]); } @@ -95,20 +89,20 @@ // Abs.W inline uint32 internal_ea_absw() { - return (int32)(int16)fetch_16(); + return (int32)(int16)fetch_2(); } // Abs.L inline uint32 internal_ea_absl() { - return fetch_32(); + return fetch_4(); } // d16(PC) inline uint32 internal_ea_pcdi() { int32 origin = reg.pc; - int32 disp = (int32)(int16)fetch_16(); + int32 disp = (int32)(int16)fetch_2(); return origin + disp; } @@ -121,15 +115,15 @@ uint32 internal_ea_ix(uint32); // CEA (個別) - uint32 cea_anin(int n); - uint32 cea_anpi_8(int n); - uint32 cea_anpi_16(int n); - uint32 cea_anpi_32(int n); - uint32 cea_anpd_8(int n); - uint32 cea_anpd_16(int n); - uint32 cea_anpd_32(int n); - uint32 cea_andi(int n); - uint32 cea_anix(int n); + uint32 cea_anin(uint n); + uint32 cea_anpi_1(uint n); + uint32 cea_anpi_2(uint n); + uint32 cea_anpi_4(uint n); + uint32 cea_anpd_1(uint n); + uint32 cea_anpd_2(uint n); + uint32 cea_anpd_4(uint n); + uint32 cea_andi(uint n); + uint32 cea_anix(uint n); uint32 cea_absw(); uint32 cea_absl(); uint32 cea_pcdi(); @@ -137,32 +131,32 @@ // FEA (個別) uint32 fea_anin(); - uint32 fea_anpi_8(); - uint32 fea_anpi_16(); - uint32 fea_anpi_32(); - uint32 fea_anpd_8(); - uint32 fea_anpd_16(); - uint32 fea_anpd_32(); + uint32 fea_anpi_1(); + uint32 fea_anpi_2(); + uint32 fea_anpi_4(); + uint32 fea_anpd_1(); + uint32 fea_anpd_2(); + uint32 fea_anpd_4(); uint32 fea_andi(); uint32 fea_anix(); uint32 fea_absw(); uint32 fea_absl(); uint32 fea_pcdi(); uint32 fea_pcix(); - void fea_imm_16(); - void fea_imm_32(); + void fea_imm_2(); + void fea_imm_4(); // CEA (グループ) uint32 cea_ctrl(); - uint32 cea_data_8(); - uint32 cea_data_16(); - uint32 cea_data_32(); + uint32 cea_data_1(); + uint32 cea_data_2(); + uint32 cea_data_4(); uint32 cea_copro(); // FEA (グループ) - uint32 fea_data_8(); - uint32 fea_data_16(); - uint32 fea_data_32(); - uint32 fea_all_8(); - uint32 fea_all_16(); - uint32 fea_all_32(); + uint32 fea_data_1(); + uint32 fea_data_2(); + uint32 fea_data_4(); + uint32 fea_all_1(); + uint32 fea_all_2(); + uint32 fea_all_4();