From a3500983ea4442bf1a4b501e809b103ad368bbff Mon Sep 17 00:00:00 2001 From: Maxim Poliakovski Date: Thu, 25 Jul 2019 19:00:41 +0200 Subject: [PATCH] Correct misspelled function name. --- main.cpp | 2 +- ppcemumain.h | 2 +- ppcmemory.cpp | 6 +++--- ppcopcodes.cpp | 32 ++++++++++++++++---------------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/main.cpp b/main.cpp index 727c51f..0971a97 100644 --- a/main.cpp +++ b/main.cpp @@ -145,7 +145,7 @@ void ppc_tbr_update() } } -void ppc_expection_handler(uint32_t exception_type, uint32_t handle_args){ +void ppc_exception_handler(uint32_t exception_type, uint32_t handle_args){ ppc_next_instruction_address = 0x0; //used to construct a new address grab_exception = true; diff --git a/ppcemumain.h b/ppcemumain.h index 32a8226..ef7ac3d 100644 --- a/ppcemumain.h +++ b/ppcemumain.h @@ -217,7 +217,7 @@ void ppc_setsoov(uint32_t a, uint32_t b); void ppc_changecrf0(uint32_t set_result); void ppc_tbr_update(); -void ppc_expection_handler(uint32_t exception_type, uint32_t handle_args); +void ppc_exception_handler(uint32_t exception_type, uint32_t handle_args); //MEMORY DECLARATIONS extern unsigned char * machine_sysram_mem; diff --git a/ppcmemory.cpp b/ppcmemory.cpp index ec92a22..665ec26 100644 --- a/ppcmemory.cpp +++ b/ppcmemory.cpp @@ -545,7 +545,7 @@ void address_quickinsert_translate(uint32_t value_insert, uint32_t address_grab, final_grab |= (address_grab & 0x1FFFF); //Check the PP Tags in the batl //if (!(ppc_state.ppc_spr[grab_batl] == 0x2)){ - // ppc_expection_handler(0x0300, 0x0); + // ppc_exception_handler(0x0300, 0x0); // } address_grab = final_grab; } @@ -769,7 +769,7 @@ void address_quickgrab_translate(uint32_t address_grab, uint8_t bit_num){ final_grab |= (address_grab & 0x1FFFF); //Check the PP Tags in the batl //if ((ppc_state.ppc_spr[grab_batl] & 0x3) == 0x0){ - // ppc_expection_handler(0x0300, 0x0); + // ppc_exception_handler(0x0300, 0x0); //} address_grab = final_grab; } @@ -974,7 +974,7 @@ void quickinstruction_translate(uint32_t address_grab){ final_grab |= (((address_grab & 0x0FFE0000) & blocklen) | (ppc_state.ppc_spr[grab_batl] & 0xFFFE0000)); final_grab |= (address_grab & 0x1FFFF); //if ((ppc_state.ppc_spr[grab_batl] & 0x3) == 0x0){ - // ppc_expection_handler(0x0400, 0x0); + // ppc_exception_handler(0x0400, 0x0); //} address_grab = final_grab; } diff --git a/ppcopcodes.cpp b/ppcopcodes.cpp index 654343d..9f42ec6 100644 --- a/ppcopcodes.cpp +++ b/ppcopcodes.cpp @@ -206,7 +206,7 @@ void ppc_illegalop(){ uint32_t grab_it = (uint32_t) illegal_code; printf("Illegal opcode reported: %d Report this! \n", grab_it); exit(-1); - //ppc_expection_handler(0x0700, 0x80000); + //ppc_exception_handler(0x0700, 0x80000); } void ppc_illegalsubop31(){ @@ -253,7 +253,7 @@ void ppc_opcode19(){ } else{ std::cout << "ILLEGAL SUBOPCODE: " << subop_grab << std::endl; - ppc_expection_handler(0x0700, 0x80000); + ppc_exception_handler(0x0700, 0x80000); } #else SubOpcode19Grabber[subop_grab](); @@ -270,7 +270,7 @@ void ppc_opcode31(){ } else{ std::cout << "ILLEGAL SUBOPCODE: " << subop_grab << std::endl; - ppc_expection_handler(0x0700, 0x80000); + ppc_exception_handler(0x0700, 0x80000); } #else SubOpcode31Grabber[subop_grab](); @@ -287,7 +287,7 @@ void ppc_opcode59(){ } else{ std::cout << "ILLEGAL SUBOPCODE: " << subop_grab << std::endl; - ppc_expection_handler(0x0700, 0x80000); + ppc_exception_handler(0x0700, 0x80000); } #else SubOpcode59Grabber[subop_grab](); @@ -304,7 +304,7 @@ void ppc_opcode63(){ } else{ std::cout << "ILLEGAL SUBOPCODE: " << subop_grab << std::endl; - ppc_expection_handler(0x0700, 0x80000); + ppc_exception_handler(0x0700, 0x80000); } #else SubOpcode63Grabber[subop_grab](); @@ -1841,7 +1841,7 @@ void ppc_rfi(){ } void ppc_sc(){ - ppc_expection_handler(0x0C00, 0x20000); + ppc_exception_handler(0x0C00, 0x20000); } void ppc_tw(){ @@ -1853,7 +1853,7 @@ void ppc_tw(){ (((int32_t)ppc_state.ppc_gpr[reg_a] == (int32_t)ppc_state.ppc_gpr[reg_b]) & (ppc_to & 0x04)) || \ ((ppc_state.ppc_gpr[reg_a] < ppc_state.ppc_gpr[reg_b]) & (ppc_to & 0x02)) || \ ((ppc_state.ppc_gpr[reg_a] > ppc_state.ppc_gpr[reg_b]) & (ppc_to & 0x01))){ - ppc_expection_handler(0x0700, 0x20000); + ppc_exception_handler(0x0700, 0x20000); } } @@ -1866,7 +1866,7 @@ void ppc_twi(){ (((int32_t)ppc_state.ppc_gpr[reg_a] == simm) & (ppc_to & 0x04)) || \ ((ppc_state.ppc_gpr[reg_a] < (uint32_t)simm) & (ppc_to & 0x02)) || \ ((ppc_state.ppc_gpr[reg_a] > (uint32_t)simm) & (ppc_to & 0x01))){ - ppc_expection_handler(0x0700, 0x20000); + ppc_exception_handler(0x0700, 0x20000); } } @@ -1924,7 +1924,7 @@ void ppc_dcbz(){ address_quickinsert_translate(0, (ppc_effective_address + 28), 4); } else{ - ppc_expection_handler(0x0600, 0x00000); + ppc_exception_handler(0x0600, 0x00000); } } @@ -1962,7 +1962,7 @@ void ppc_stbux(){ address_quickinsert_translate(ppc_result_d, ppc_effective_address, 1); } else{ - ppc_expection_handler(0x07000, 0x20000); + ppc_exception_handler(0x07000, 0x20000); } ppc_result_a = ppc_effective_address; ppc_store_result_rega(); @@ -2087,7 +2087,7 @@ void ppc_lbzu(){ ppc_effective_address = ppc_result_a + grab_d; } else{ - ppc_expection_handler(0x0700, 0x20000); + ppc_exception_handler(0x0700, 0x20000); } address_quickgrab_translate(ppc_effective_address, 1); ppc_result_d = return_value; @@ -2112,7 +2112,7 @@ void ppc_lbzux(){ ppc_effective_address = ppc_result_a + ppc_result_b; } else{ - ppc_expection_handler(0x0700, 0x20000); + ppc_exception_handler(0x0700, 0x20000); } address_quickgrab_translate(ppc_effective_address, 1); ppc_result_d = return_value; @@ -2271,7 +2271,7 @@ void ppc_lwzu(){ ppc_effective_address = ppc_result_a + grab_d; } else{ - ppc_expection_handler(0x0700, 0x20000); + ppc_exception_handler(0x0700, 0x20000); } address_quickgrab_translate(ppc_effective_address, 4); ppc_result_d = return_value; @@ -2296,7 +2296,7 @@ void ppc_lwzux(){ ppc_effective_address = ppc_result_a + ppc_result_b; } else{ - ppc_expection_handler(0x0700, 0x20000); + ppc_exception_handler(0x0700, 0x20000); } address_quickgrab_translate(ppc_effective_address, 4); ppc_result_d = return_value; @@ -2385,10 +2385,10 @@ void ppc_lswx(){ ppc_grab_regsdab(); //Invalid instruction forms if ((ppc_result_d == 0) && (ppc_result_a == 0)){ - ppc_expection_handler(0x0700, 0x100000); + ppc_exception_handler(0x0700, 0x100000); } if ((ppc_result_d == ppc_result_a) || (ppc_result_a == ppc_result_b)){ - ppc_expection_handler(0x0700, 0x100000); + ppc_exception_handler(0x0700, 0x100000); } ppc_effective_address = (reg_a == 0)?ppc_result_b:(ppc_result_a + ppc_result_b); grab_inb = ppc_state.ppc_spr[1] & 127;