Skip to content

Commit

Permalink
[#314] Z80 fixes, zx48-ula fixes + zoom + performance
Browse files Browse the repository at this point in the history
  • Loading branch information
@vbmacher
vbmacher committed Feb 22, 2023
1 parent 07d2127 commit 6bdfb1c
Show file tree
Hide file tree
Showing 5 changed files with 335 additions and 269 deletions.
22 changes: 11 additions & 11 deletions plugins/cpu/z80-cpu/src/main/java/net/emustudio/plugins/cpu/zilogZ80/DispatchTables.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,47 +298,47 @@ public class DispatchTables {
DISPATCH_TABLE[0xFE] = lookup.findVirtual(EmulatorEngine.class, "I_CP_N", retInt);
DISPATCH_TABLE[0xFF] = lookup.findVirtual(EmulatorEngine.class, "I_RST", retInt);

DISPATCH_TABLE_ED[0x40] = lookup.findVirtual(EmulatorEngine.class, "I_IN_R_REF_C", retInt);
DISPATCH_TABLE_ED[0x40] = lookup.findVirtual(EmulatorEngine.class, "I_IN_B_REF_C", retInt);
DISPATCH_TABLE_ED[0x41] = lookup.findVirtual(EmulatorEngine.class, "I_OUT_REF_C_R", retInt);
DISPATCH_TABLE_ED[0x42] = lookup.findVirtual(EmulatorEngine.class, "I_SBC_HL_RP", retInt);
DISPATCH_TABLE_ED[0x43] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_NN_BC", retInt);
DISPATCH_TABLE_ED[0x44] = lookup.findVirtual(EmulatorEngine.class, "I_NEG", retInt);
DISPATCH_TABLE_ED[0x45] = lookup.findVirtual(EmulatorEngine.class, "I_RETN", retInt);
DISPATCH_TABLE_ED[0x46] = lookup.findVirtual(EmulatorEngine.class, "I_IM_0", retInt);
DISPATCH_TABLE_ED[0x47] = lookup.findVirtual(EmulatorEngine.class, "I_LD_I_A", retInt);
DISPATCH_TABLE_ED[0x48] = lookup.findVirtual(EmulatorEngine.class, "I_IN_R_REF_C", retInt);
DISPATCH_TABLE_ED[0x48] = lookup.findVirtual(EmulatorEngine.class, "I_IN_C_REF_C", retInt);
DISPATCH_TABLE_ED[0x49] = lookup.findVirtual(EmulatorEngine.class, "I_OUT_REF_C_R", retInt);
DISPATCH_TABLE_ED[0x4A] = lookup.findVirtual(EmulatorEngine.class, "I_ADC_HL_RP", retInt);
DISPATCH_TABLE_ED[0x4B] = lookup.findVirtual(EmulatorEngine.class, "I_LD_RP_REF_NN", retInt);
DISPATCH_TABLE_ED[0x4C] = lookup.findVirtual(EmulatorEngine.class, "I_NEG", retInt);
DISPATCH_TABLE_ED[0x4D] = lookup.findVirtual(EmulatorEngine.class, "I_RETI", retInt);
DISPATCH_TABLE_ED[0x4E] = lookup.findVirtual(EmulatorEngine.class, "I_IM_0", retInt);
DISPATCH_TABLE_ED[0x4F] = lookup.findVirtual(EmulatorEngine.class, "I_LD_R_A", retInt);
DISPATCH_TABLE_ED[0x50] = lookup.findVirtual(EmulatorEngine.class, "I_IN_R_REF_C", retInt);
DISPATCH_TABLE_ED[0x50] = lookup.findVirtual(EmulatorEngine.class, "I_IN_D_REF_C", retInt);
DISPATCH_TABLE_ED[0x51] = lookup.findVirtual(EmulatorEngine.class, "I_OUT_REF_C_R", retInt);
DISPATCH_TABLE_ED[0x52] = lookup.findVirtual(EmulatorEngine.class, "I_SBC_HL_RP", retInt);
DISPATCH_TABLE_ED[0x53] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_NN_DE", retInt);
DISPATCH_TABLE_ED[0x54] = lookup.findVirtual(EmulatorEngine.class, "I_NEG", retInt);
DISPATCH_TABLE_ED[0x55] = lookup.findVirtual(EmulatorEngine.class, "I_RETN", retInt);
DISPATCH_TABLE_ED[0x56] = lookup.findVirtual(EmulatorEngine.class, "I_IM_1", retInt);
DISPATCH_TABLE_ED[0x57] = lookup.findVirtual(EmulatorEngine.class, "I_LD_A_I", retInt);
DISPATCH_TABLE_ED[0x58] = lookup.findVirtual(EmulatorEngine.class, "I_IN_R_REF_C", retInt);
DISPATCH_TABLE_ED[0x58] = lookup.findVirtual(EmulatorEngine.class, "I_IN_E_REF_C", retInt);
DISPATCH_TABLE_ED[0x59] = lookup.findVirtual(EmulatorEngine.class, "I_OUT_REF_C_R", retInt);
DISPATCH_TABLE_ED[0x5A] = lookup.findVirtual(EmulatorEngine.class, "I_ADC_HL_RP", retInt);
DISPATCH_TABLE_ED[0x5B] = lookup.findVirtual(EmulatorEngine.class, "I_LD_RP_REF_NN", retInt);
DISPATCH_TABLE_ED[0x5C] = lookup.findVirtual(EmulatorEngine.class, "I_NEG", retInt);
DISPATCH_TABLE_ED[0x5D] = lookup.findVirtual(EmulatorEngine.class, "I_RETN", retInt);
DISPATCH_TABLE_ED[0x5E] = lookup.findVirtual(EmulatorEngine.class, "I_IM_2", retInt);
DISPATCH_TABLE_ED[0x5F] = lookup.findVirtual(EmulatorEngine.class, "I_LD_A_R", retInt);
DISPATCH_TABLE_ED[0x60] = lookup.findVirtual(EmulatorEngine.class, "I_IN_R_REF_C", retInt);
DISPATCH_TABLE_ED[0x60] = lookup.findVirtual(EmulatorEngine.class, "I_IN_H_REF_C", retInt);
DISPATCH_TABLE_ED[0x61] = lookup.findVirtual(EmulatorEngine.class, "I_OUT_REF_C_R", retInt);
DISPATCH_TABLE_ED[0x62] = lookup.findVirtual(EmulatorEngine.class, "I_SBC_HL_RP", retInt);
DISPATCH_TABLE_ED[0x63] = lookup.findVirtual(EmulatorEngine.class, "I_ED_LD_REF_NN_HL", retInt);
DISPATCH_TABLE_ED[0x64] = lookup.findVirtual(EmulatorEngine.class, "I_NEG", retInt);
DISPATCH_TABLE_ED[0x65] = lookup.findVirtual(EmulatorEngine.class, "I_RETN", retInt);
DISPATCH_TABLE_ED[0x66] = lookup.findVirtual(EmulatorEngine.class, "I_IM_0", retInt);
DISPATCH_TABLE_ED[0x67] = lookup.findVirtual(EmulatorEngine.class, "I_RRD", retInt);
DISPATCH_TABLE_ED[0x68] = lookup.findVirtual(EmulatorEngine.class, "I_IN_R_REF_C", retInt);
DISPATCH_TABLE_ED[0x68] = lookup.findVirtual(EmulatorEngine.class, "I_IN_L_REF_C", retInt);
DISPATCH_TABLE_ED[0x69] = lookup.findVirtual(EmulatorEngine.class, "I_OUT_REF_C_R", retInt);
DISPATCH_TABLE_ED[0x6A] = lookup.findVirtual(EmulatorEngine.class, "I_ADC_HL_RP", retInt);
DISPATCH_TABLE_ED[0x6B] = lookup.findVirtual(EmulatorEngine.class, "I_LD_RP_REF_NN", retInt);
Expand All @@ -353,7 +353,7 @@ public class DispatchTables {
DISPATCH_TABLE_ED[0x74] = lookup.findVirtual(EmulatorEngine.class, "I_NEG", retInt);
DISPATCH_TABLE_ED[0x75] = lookup.findVirtual(EmulatorEngine.class, "I_RETN", retInt);
DISPATCH_TABLE_ED[0x76] = lookup.findVirtual(EmulatorEngine.class, "I_IM_1", retInt);
DISPATCH_TABLE_ED[0x78] = lookup.findVirtual(EmulatorEngine.class, "I_IN_R_REF_C", retInt);
DISPATCH_TABLE_ED[0x78] = lookup.findVirtual(EmulatorEngine.class, "I_IN_A_REF_C", retInt);
DISPATCH_TABLE_ED[0x79] = lookup.findVirtual(EmulatorEngine.class, "I_OUT_REF_C_R", retInt);
DISPATCH_TABLE_ED[0x7A] = lookup.findVirtual(EmulatorEngine.class, "I_ADC_HL_RP", retInt);
DISPATCH_TABLE_ED[0x7B] = lookup.findVirtual(EmulatorEngine.class, "I_LD_RP_REF_NN", retInt);
Expand Down Expand Up @@ -750,8 +750,8 @@ public class DispatchTables {
DISPATCH_TABLE_DD[0x71] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IX_D_C", retInt);
DISPATCH_TABLE_DD[0x72] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IX_D_D", retInt);
DISPATCH_TABLE_DD[0x73] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IX_D_E", retInt);
DISPATCH_TABLE_DD[0x74] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IX_D_IXH", retInt);
DISPATCH_TABLE_DD[0x75] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IX_D_IXL", retInt);
DISPATCH_TABLE_DD[0x74] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IX_D_H", retInt);
DISPATCH_TABLE_DD[0x75] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IX_D_L", retInt);
DISPATCH_TABLE_DD[0x76] = lookup.findVirtual(EmulatorEngine.class, "I_HALT", retInt);
DISPATCH_TABLE_DD[0x77] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IX_D_A", retInt);
DISPATCH_TABLE_DD[0x78] = lookup.findVirtual(EmulatorEngine.class, "I_LD_A_B", retInt);
Expand Down Expand Up @@ -1007,8 +1007,8 @@ public class DispatchTables {
DISPATCH_TABLE_FD[0x71] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IY_D_C", retInt);
DISPATCH_TABLE_FD[0x72] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IY_D_D", retInt);
DISPATCH_TABLE_FD[0x73] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IY_D_E", retInt);
DISPATCH_TABLE_FD[0x74] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IY_D_IYH", retInt);
DISPATCH_TABLE_FD[0x75] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IY_D_IYL", retInt);
DISPATCH_TABLE_FD[0x74] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IY_D_H", retInt);
DISPATCH_TABLE_FD[0x75] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IY_D_L", retInt);
DISPATCH_TABLE_FD[0x76] = lookup.findVirtual(EmulatorEngine.class, "I_HALT", retInt);
DISPATCH_TABLE_FD[0x77] = lookup.findVirtual(EmulatorEngine.class, "I_LD_REF_IY_D_A", retInt);
DISPATCH_TABLE_FD[0x78] = lookup.findVirtual(EmulatorEngine.class, "I_LD_A_B", retInt);
Expand Down
Loading

0 comments on commit 6bdfb1c

Please sign in to comment.