Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2025-01-06 16:31:45 +00:00
Code Issues Projects Releases Wiki Activity

More fixes

Browse Source 
4% speedup reported in the benchmark

Co-Authored-By: joevt <950609+joevt@users.noreply.github.com>
This commit is contained in:
dingusdev 2024-09-18 07:15:14 -07:00
parent e2ed352533
commit 5ae9fcbd38
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cpu/ppc/ppcexec.cpp
View File

@ -390,7 +390,7 @@ static void ppc_exec_inner()
eb_start = ppc_next_instruction_address;
if (!(exec_flags & EXEF_RFI) && (eb_start & PPC_PAGE_MASK) == page_start) {
pc_real += (int)eb_start - (int)ppc_state.pc;
ppc_set_cur_instruction(pc_real);
instr = ppc_set_cur_instruction(pc_real);
} else {
page_start = eb_start & PPC_PAGE_MASK;
eb_end = page_start + PPC_PAGE_SIZE - 1;
@ -401,8 +401,8 @@ static void ppc_exec_inner()
exec_flags = 0;
} else {
ppc_state.pc += 4;
pc_real += 4;
ppc_set_cur_instruction(pc_real);
pc_real += 4;
instr = ppc_set_cur_instruction(pc_real);
}
}
}
@ -485,7 +485,7 @@ static void ppc_exec_until_inner(const uint32_t goal_addr)
eb_start = ppc_next_instruction_address;
if (!(exec_flags & EXEF_RFI) && (eb_start & PPC_PAGE_MASK) == page_start) {
pc_real += (int)eb_start - (int)ppc_state.pc;
ppc_set_cur_instruction(pc_real);
instr = ppc_set_cur_instruction(pc_real);
} else {
page_start = eb_start & PPC_PAGE_MASK;
eb_end = page_start + PPC_PAGE_SIZE - 1;
@ -497,7 +497,7 @@ static void ppc_exec_until_inner(const uint32_t goal_addr)
} else {
ppc_state.pc += 4;
pc_real += 4;
ppc_set_cur_instruction(pc_real);
instr = ppc_set_cur_instruction(pc_real);
}
if (ppc_state.pc == goal_addr)
@ -556,7 +556,7 @@ static void ppc_exec_dbg_inner(const uint32_t start_addr, const uint32_t size)
eb_start = ppc_next_instruction_address;
if (!(exec_flags & EXEF_RFI) && (eb_start & PPC_PAGE_MASK) == page_start) {
pc_real += (int)eb_start - (int)ppc_state.pc;
ppc_set_cur_instruction(pc_real);
instr = ppc_set_cur_instruction(pc_real);
} else {
page_start = eb_start & PPC_PAGE_MASK;
eb_end = page_start + PPC_PAGE_SIZE - 1;
@ -568,7 +568,7 @@ static void ppc_exec_dbg_inner(const uint32_t start_addr, const uint32_t size)
} else {
ppc_state.pc += 4;
pc_real += 4;
ppc_set_cur_instruction(pc_real);
instr = ppc_set_cur_instruction(pc_real);
}
}
}

12
cpu/ppc/ppcmmu.cpp
View File

@ -1425,7 +1425,7 @@ public:
};
#endif
uint64_t mem_read_dbg(uint32_t virt_addr, uint32_t instr, uint32_t size) {
uint64_t mem_read_dbg(uint32_t virt_addr, uint32_t size) {
uint32_t save_dsisr, save_dar;
uint64_t ret_val;
@ -1437,19 +1437,19 @@ uint64_t mem_read_dbg(uint32_t virt_addr, uint32_t instr, uint32_t size) {
try {
switch (size) {
case 1:
ret_val = mmu_read_vmem<uint8_t>(virt_addr, instr);
ret_val = mmu_read_vmem<uint8_t>(virt_addr, 0);
break;
case 2:
ret_val = mmu_read_vmem<uint16_t>(virt_addr, instr);
ret_val = mmu_read_vmem<uint16_t>(virt_addr, 0);
break;
case 4:
ret_val = mmu_read_vmem<uint32_t>(virt_addr, instr);
ret_val = mmu_read_vmem<uint32_t>(virt_addr, 0);
break;
case 8:
ret_val = mmu_read_vmem<uint64_t>(virt_addr, instr);
ret_val = mmu_read_vmem<uint64_t>(virt_addr, 0);
break;
default:
ret_val = mmu_read_vmem<uint8_t>(virt_addr, instr);
ret_val = mmu_read_vmem<uint8_t>(virt_addr, 0);
}
} catch (std::invalid_argument& exc) {
/* restore MMU-related CPU state */

2
cpu/ppc/ppcmmu.h
View File

@ -125,7 +125,7 @@ extern void mmu_change_mode(void);
extern void mmu_pat_ctx_changed();
extern void tlb_flush_entry(uint32_t ea);
extern uint64_t mem_read_dbg(uint32_t virt_addr, uint32_t instr, uint32_t size);
extern uint64_t mem_read_dbg(uint32_t virt_addr, uint32_t size);
uint8_t *mmu_translate_imem(uint32_t vaddr, uint32_t *paddr = nullptr);
bool mmu_translate_dbg(uint32_t guest_va, uint32_t &guest_pa);

6
debugger/debugger.cpp
View File

@ -124,7 +124,7 @@ static uint32_t disasm_68k(uint32_t count, uint32_t address) {
for (; power_on && count > 0; count--) {
/* prefetch opcode bytes (a 68k instruction can occupy 2...10 bytes) */
for (int i = 0; i < sizeof(code); i++) {
code[i] = mem_read_dbg(address + i, 0, 1);
code[i] = mem_read_dbg(address + i, 1);
}
const uint8_t *code_ptr = code;
@ -174,7 +174,7 @@ void exec_single_68k(uint32_t instr)
/* calculate address of the current opcode table entry as follows:
get_word(68k_PC) * entry_size + table_base */
cur_instr_tab_entry = mmu_read_vmem<uint16_t>(((cur_68k_pc) * 8 + emu_table_virt), instr);
cur_instr_tab_entry = mmu_read_vmem<uint16_t>(cur_68k_pc, 0) * 8 + emu_table_virt;
/* grab the PPC PC too */
ppc_pc = get_reg(string("PC"));
@ -314,7 +314,7 @@ static void dump_mem(string& params) {
cout << endl;
chars_per_line = 0;
}
val = mem_read_dbg(addr, 0, cell_size);
val = mem_read_dbg(addr, cell_size);
if (is_char) {
cout << (char)val;
chars_per_line += cell_size;