Macintosh-Tools/dingusppc
1
0
Fork 0
mirror of https://github.com/dingusdev/dingusppc.git synced 2024-12-27 15:29:39 +00:00
Code Issues Projects Releases Wiki Activity

WIP: interpreter refactoring, part 2.

Browse Source
This commit is contained in:
Maxim Poliakovski 2021-12-28 13:36:31 +01:00
parent 0d5817042e
commit df772f57e2
2 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
cpu/ppc/ppcopcodes.cpp
View File

@ -241,16 +241,25 @@ void dppc_interpreter::ppc_addis() {
} }
void dppc_interpreter::ppc_add() { void dppc_interpreter::ppc_add() {
/*
ppc_grab_regsdab(); ppc_grab_regsdab();
ppc_result_d = ppc_result_a + ppc_result_b; ppc_result_d = ppc_result_a + ppc_result_b;
if (oe_flag) if (oe_flag)
ppc_setsoov(ppc_result_a, ~ppc_result_b, ppc_result_d); ppc_setsoov(ppc_result_a, ~ppc_result_b, ppc_result_d);
if (rc_flag) if (rc_flag)
ppc_changecrf0(ppc_result_d); ppc_changecrf0(ppc_result_d);
ppc_store_result_regd(); ppc_store_result_regd();*/
GET_rD_iA_iB(ppc_cur_instruction);
uint32_t result = imm_a + imm_b;
if (oe_flag)
ppc_setsoov(imm_a, ~imm_b, result);
if (rc_flag)
ppc_changecrf0(result);
SET_GPR(reg_d, result);
} }
void dppc_interpreter::ppc_addc() { void dppc_interpreter::ppc_addc() {
/*
ppc_grab_regsdab(); ppc_grab_regsdab();
ppc_result_d = ppc_result_a + ppc_result_b; ppc_result_d = ppc_result_a + ppc_result_b;
ppc_carry(ppc_result_a, ppc_result_d); ppc_carry(ppc_result_a, ppc_result_d);
@ -260,7 +269,15 @@ void dppc_interpreter::ppc_addc() {
if (rc_flag) if (rc_flag)
ppc_changecrf0(ppc_result_d); ppc_changecrf0(ppc_result_d);
ppc_store_result_regd(); ppc_store_result_regd();*/
GET_rD_iA_iB(ppc_cur_instruction);
uint32_t result = imm_a + imm_b;
ppc_carry(imm_a, result);
if (oe_flag)
ppc_setsoov(imm_a, ~imm_b, result);
if (rc_flag)
ppc_changecrf0(result);
SET_GPR(reg_d, result);
} }
void dppc_interpreter::ppc_adde() { void dppc_interpreter::ppc_adde() {
@ -747,6 +764,7 @@ void dppc_interpreter::ppc_rlwimi() {
} }
void dppc_interpreter::ppc_rlwinm() { void dppc_interpreter::ppc_rlwinm() {
/*
ppc_grab_regssa(); ppc_grab_regssa();
unsigned rot_sh = (ppc_cur_instruction >> 11) & 31; unsigned rot_sh = (ppc_cur_instruction >> 11) & 31;
unsigned rot_mb = (ppc_cur_instruction >> 6) & 31; unsigned rot_mb = (ppc_cur_instruction >> 6) & 31;
@ -757,7 +775,19 @@ void dppc_interpreter::ppc_rlwinm() {
if ((ppc_cur_instruction & 0x01) == 1) { if ((ppc_cur_instruction & 0x01) == 1) {
ppc_changecrf0(ppc_result_a); ppc_changecrf0(ppc_result_a);
} }
ppc_store_result_rega(); ppc_store_result_rega();*/
uint32_t opcode = ppc_cur_instruction;
GET_rA_iS(opcode);
unsigned rot_sh = (opcode >> 11) & 31;
unsigned rot_mb = (opcode >> 6) & 31;
unsigned rot_me = (opcode >> 1) & 31;
uint32_t mask = rot_mask(rot_mb, rot_me);
uint32_t r = ((imm_d << rot_sh) | (imm_d >> (32 - rot_sh)));
r &= mask;
SET_GPR(reg_a, r);
if (ppc_cur_instruction & 1) {
ppc_changecrf0(r);
}
} }
void dppc_interpreter::ppc_rlwnm() { void dppc_interpreter::ppc_rlwnm() {

5
debugger/debugger.cpp
View File

@ -20,6 +20,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
#include <array> #include <array>
#include <chrono>
#include <fstream> #include <fstream>
#include <iomanip> #include <iomanip>
#include <iostream> #include <iostream>
@ -499,7 +500,11 @@ void enter_debugger() {
exec_until_68k(addr); exec_until_68k(addr);
#endif #endif
} else { } else {
auto start_time = std::chrono::steady_clock::now();
ppc_exec_until(addr); ppc_exec_until(addr);
auto end_time = std::chrono::steady_clock::now();
auto time_elapsed = std::chrono::duration_cast<std::chrono::nanoseconds>(end_time - start_time);
LOG_F(INFO, "Time elapsed: %lld ns", time_elapsed.count());
} }
} catch (invalid_argument& exc) { } catch (invalid_argument& exc) {
cout << exc.what() << endl; cout << exc.what() << endl;