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

Floating point overhaul, part 1

Browse Source 
Cleaned up formatting and reworked the INF/NAN checks
This commit is contained in:
dingusdev 2021-10-09 15:08:53 -07:00
parent d5960ca70b
commit e344b089b3
3 changed files with 210 additions and 185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
cpu/ppc/ppcemu.h
View File

@ -200,6 +200,70 @@ enum class BB_end_kind {
BB_RFI /* the rfi instruction is encountered */ BB_RFI /* the rfi instruction is encountered */
}; };
enum class CR_select {
CR0_field = (0xF << 28),
};
enum class CRx_bit {
CR_SO = 0,
CR_EQ,
CR_GT,
CR_LT
};
enum class CR1_bit {
CR1_OX = 24,
CR1_VX,
CR1_FEX,
CR1_FX,
};
enum class FPSCR_bit {
FPSCR_RN = 0x3,
FPSCR_NI = 0x4,
FPSCR_XE = 0x8,
FPSCR_ZE = 0x10,
FPSCR_UE = 0x20,
FPSCR_OE = 0x40,
FPSCR_VE = 0x80,
FPSCR_VXCVI = 0x100,
FPSCR_VXSQRT = 0x200,
FPSCR_VXSOFT = 0x400,
FPSCR_FPRF = 0x1F000,
FPSCR_FPCC_FUNAN = 0x10000,
FPSCR_FPCC_ZERO = 0x8000,
FPSCR_FPCC_POS = 0x4000,
FPSCR_FPCC_NEG = 0x2000,
FPSCR_FPCC_FPRCD = 0x1000,
FPSCR_FI = (1 << 17),
FPSCR_FR = (1 << 18),
FPSCR_VXVC = (1 << 19),
FPSCR_VXIMZ = (1 << 20),
FPSCR_VXZDZ = (1 << 21),
FPSCR_VXIDI = (1 << 22),
FPSCR_VXISI = (1 << 23),
FPSCR_VXSNAN = (1 << 24),
FPSCR_XX = (1 << 25),
FPSCR_ZX = (1 << 26),
FPSCR_UX = (1 << 27),
FPSCR_OX = (1 << 28),
FPSCR_VX = (1 << 29),
FPSCR_FEX = (1 << 30),
FPSCR_FX = (1 << 31)
};
//for inf and nan checks
enum FPOP : int {
DIV = 0x12,
SUB = 0x14,
ADD = 0x15,
MUL = 0x19,
FMSUB = 0x1C,
FMADD = 0x1D,
FNMSUB = 0x1E,
FNMADD = 0x1F,
};
/** PowerPC exception types. */ /** PowerPC exception types. */
enum class Except_Type { enum class Except_Type {
EXC_SYSTEM_RESET = 1, EXC_SYSTEM_RESET = 1,
@ -271,7 +335,6 @@ void ppc_opcode63();
void initialize_ppc_opcode_tables(); void initialize_ppc_opcode_tables();
extern bool ppc_confirm_inf_nan(uint64_t input_a, uint64_t input_b, bool is_single, uint32_t op);
extern double fp_return_double(uint32_t reg); extern double fp_return_double(uint32_t reg);
extern uint64_t fp_return_uint64(uint32_t reg); extern uint64_t fp_return_uint64(uint32_t reg);

9
cpu/ppc/ppcexec.cpp
View File

@ -253,8 +253,7 @@ void ppc_opcode31() {
oe_flag = ppc_cur_instruction & 0x400; oe_flag = ppc_cur_instruction & 0x400;
#ifdef EXHAUSTIVE_DEBUG #ifdef EXHAUSTIVE_DEBUG
uint32_t regrab = (uint32_t)subop_grab; LOG_F(INFO, "Executing Opcode 31 table subopcode entry %n \n", (uint32_t)subop_grab);
LOG_F(INFO, "Executing Opcode 63 table subopcode entry \n", regrab);
#endif // EXHAUSTIVE_DEBUG #endif // EXHAUSTIVE_DEBUG
SubOpcode31Grabber[subop_grab](); SubOpcode31Grabber[subop_grab]();
@ -264,8 +263,7 @@ void ppc_opcode59() {
uint16_t subop_grab = (ppc_cur_instruction >> 1) & 0x1F; uint16_t subop_grab = (ppc_cur_instruction >> 1) & 0x1F;
rc_flag = ppc_cur_instruction & 1; rc_flag = ppc_cur_instruction & 1;
#ifdef EXHAUSTIVE_DEBUG #ifdef EXHAUSTIVE_DEBUG
uint32_t regrab = (uint32_t)subop_grab; LOG_F(INFO, "Executing Opcode 59 table subopcode entry %n \n", (uint32_t)subop_grab);
LOG_F(INFO, "Executing Opcode 59 table subopcode entry \n", regrab);
#endif // EXHAUSTIVE_DEBUG #endif // EXHAUSTIVE_DEBUG
SubOpcode59Grabber[subop_grab](); SubOpcode59Grabber[subop_grab]();
} }
@ -274,8 +272,7 @@ void ppc_opcode63() {
uint16_t subop_grab = (ppc_cur_instruction >> 1) & 0x3FF; uint16_t subop_grab = (ppc_cur_instruction >> 1) & 0x3FF;
rc_flag = ppc_cur_instruction & 1; rc_flag = ppc_cur_instruction & 1;
#ifdef EXHAUSTIVE_DEBUG #ifdef EXHAUSTIVE_DEBUG
uint32_t regrab = (uint32_t)subop_grab; LOG_F(INFO, "Executing Opcode 63 table subopcode entry %n \n", (uint32_t)subop_grab);
LOG_F(INFO, "Executing Opcode 63 table subopcode entry \n", regrab);
#endif // EXHAUSTIVE_DEBUG #endif // EXHAUSTIVE_DEBUG
SubOpcode63Grabber[subop_grab](); SubOpcode63Grabber[subop_grab]();
} }

285
cpu/ppc/ppcfpopcodes.cpp
View File

@ -25,6 +25,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
#include "ppcmmu.h" #include "ppcmmu.h"
#include <array> #include <array>
#include <cfenv> #include <cfenv>
#include <cfloat>
#include <cinttypes> #include <cinttypes>
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>
@ -179,141 +180,115 @@ int64_t round_to_neg_inf(double f) {
return static_cast<int32_t>(floor(f)); return static_cast<int32_t>(floor(f));
} }
void ppc_toggle_fpscr_fex() { void update_fpscr_fex() {
bool fex_result = ((ppc_state.fpscr & 0x20000000) & (ppc_state.fpscr & 0x80)); int fex_result = !!((ppc_state.fpscr & (ppc_state.fpscr << 22)) & 0x3E000000);
fex_result |= ((ppc_state.fpscr & 0x10000000) & (ppc_state.fpscr & 0x40)); ppc_state.fpscr = (ppc_state.fpscr & ~0x40000000) | (fex_result << 30);
fex_result |= ((ppc_state.fpscr & 0x8000000) & (ppc_state.fpscr & 0x20));
fex_result |= ((ppc_state.fpscr & 0x4000000) & (ppc_state.fpscr & 0x10));
fex_result |= ((ppc_state.fpscr & 0x2000000) & (ppc_state.fpscr & 0x8));
ppc_state.fpscr |= (fex_result << 30);
} }
bool ppc_confirm_inf_nan(int chosen_reg_1, int chosen_reg_2, bool is_single, uint32_t op) { template <typename T>
uint64_t input_a = ppc_state.fpr[chosen_reg_1].int64_r; constexpr auto ppc_confirm_inf_nan(int chosen_reg_1, int chosen_reg_2, int chosen_reg_3, uint32_t op) {
uint64_t input_b = ppc_state.fpr[chosen_reg_2].int64_r; T input_a = T(ppc_state.fpr[chosen_reg_1].int64_r);
T input_b = T(ppc_state.fpr[chosen_reg_2].int64_r);
if (is_single) { T input_c = T(ppc_state.fpr[chosen_reg_3].int64_r);
uint32_t exp_a = (input_a >> 23) & 0xff;
uint32_t exp_b = (input_b >> 23) & 0xff;
ppc_state.fpscr &= 0x7fbfffff; ppc_state.fpscr &= 0x7fbfffff;
switch (op) { bool inf_or_nan = false;
case 36:
if ((exp_a == 0xff) && (exp_b == 0xff)) {
ppc_state.fpscr |= 0x80400000;
ppc_toggle_fpscr_fex();
return true;
} else if ((input_a == 0) && (input_b == 0)) {
ppc_state.fpscr |= 0x80200000;
ppc_toggle_fpscr_fex();
return true;
}
break;
case 40:
if ((exp_a == 0xff) && (exp_b == 0xff)) {
ppc_state.fpscr |= 0x80800000;
ppc_toggle_fpscr_fex();
return true;
}
break;
case 50:
if (((exp_a == 0xff) & (input_b == 0)) | ((exp_b == 0xff) & (input_a == 0))) {
ppc_state.fpscr |= 0x80100000;
ppc_toggle_fpscr_fex();
return true;
}
break;
case 56:
case 58:
if ((exp_a == 0xff) && (exp_b == 0xff)) {
ppc_state.fpscr |= 0x80800000;
ppc_toggle_fpscr_fex();
return true;
}
break;
default:
return false;
}
} else {
uint32_t exp_a = (input_a >> 52) & 0x7ff;
uint32_t exp_b = (input_b >> 52) & 0x7ff;
ppc_state.fpscr &= 0x7fbfffff;
switch (op) { switch (op) {
case 36: case FPOP::DIV:
if ((exp_a == 0x7ff) && (exp_b == 0x7ff)) { if (isnan(input_a) && isnan(input_b)) {
ppc_state.fpscr |= 0x80400000; ppc_state.fpscr |= ((uint32_t)FPSCR_bit::FPSCR_FX | (uint32_t)FPSCR_bit::FPSCR_VXIDI);
ppc_toggle_fpscr_fex(); inf_or_nan = true;
return true; } else if ((input_a == FP_ZERO) && (input_b == FP_ZERO)) {
} else if ((input_a == 0) && (input_b == 0)) { ppc_state.fpscr |= ((uint32_t)FPSCR_bit::FPSCR_FX | (uint32_t)FPSCR_bit::FPSCR_VXZDZ);
ppc_state.fpscr |= 0x80200000; inf_or_nan = true;
ppc_toggle_fpscr_fex();
return true;
} }
update_fpscr_fex();
return inf_or_nan;
break; break;
case 40: case FPOP::SUB:
if ((exp_a == 0x7ff) && (exp_b == 0x7ff)) { if (isnan(input_a) && isnan(input_b)) {
ppc_state.fpscr |= 0x80800000; ppc_state.fpscr |= ((uint32_t)FPSCR_bit::FPSCR_FX | (uint32_t)FPSCR_bit::FPSCR_VXISI);
ppc_toggle_fpscr_fex(); inf_or_nan = true;
return true;
} }
update_fpscr_fex();
return inf_or_nan;
break; break;
case 50: case FPOP::ADD:
if (((exp_a == 0x7ff) & (input_b == 0)) | ((exp_b == 0x7ff) & (input_a == 0))) { if ((isnan(input_a) & (input_b == FP_ZERO)) | (isnan(input_b) & (input_a == FP_ZERO))) {
ppc_state.fpscr |= 0x80100000; ppc_state.fpscr |= 0x80100000;
ppc_toggle_fpscr_fex(); inf_or_nan = true;
return true;
} }
update_fpscr_fex();
return inf_or_nan;
break; break;
case 56: case FPOP::MUL:
case 58: if (((input_a == FP_ZERO) && (input_c == FP_INFINITE)) ||
if ((exp_a == 0xff) && (exp_b == 0xff)) { ((input_c == FP_ZERO) && (input_a == FP_INFINITE))) {
ppc_state.fpscr |= 0x80800000; ppc_state.fpscr |=
ppc_toggle_fpscr_fex(); ((uint32_t)FPSCR_bit::FPSCR_FX | (uint32_t)FPSCR_bit::FPSCR_VXSNAN |
return true; (uint32_t)FPSCR_bit::FPSCR_VXIMZ);
inf_or_nan = true;
} }
update_fpscr_fex();
return inf_or_nan;
break;
case FPOP::FMSUB:
case FPOP::FNMSUB:
if (isnan(input_a) || isnan(input_b) || isnan(input_c)) {
ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_VXSNAN;
inf_or_nan = true;
if (((input_a == FP_ZERO) && (input_c == FP_INFINITE)) ||
((input_c == FP_ZERO) && (input_a == FP_INFINITE))) {
ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_VXIMZ;
}
}
update_fpscr_fex();
return inf_or_nan;
break;
case FPOP::FMADD:
case FPOP::FNMADD:
if (isnan(input_a) || isnan(input_b) || isnan(input_c)) {
ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_VXSNAN;
inf_or_nan = true;
}
update_fpscr_fex();
return inf_or_nan;
break; break;
default: default:
return false; return false;
} }
} }
return false; void fpresult_update(double set_result, bool confirm_arc) {
}
void fpresult_update(uint64_t set_result, bool confirm_arc) {
bool confirm_ov = (bool)std::fetestexcept(FE_OVERFLOW); bool confirm_ov = (bool)std::fetestexcept(FE_OVERFLOW);
if (confirm_ov) { if (confirm_ov) {
ppc_state.fpscr |= 0x80001000; ppc_state.fpscr |= ((uint32_t)FPSCR_bit::FPSCR_FX | ((uint32_t)FPSCR_bit::FPSCR_FPRF & (uint32_t)FPSCR_bit::FPSCR_FPCC_FUNAN));
} }
if (confirm_arc) { if (confirm_arc) {
ppc_state.fpscr |= 0x80010000; ppc_state.fpscr |= ((uint32_t)FPSCR_bit::FPSCR_FX | ((uint32_t)FPSCR_bit::FPSCR_FPRF & (uint32_t)FPSCR_bit::FPSCR_FPCC_FUNAN));
ppc_state.fpscr &= 0xFFFF0FFF; ppc_state.fpscr &= 0xFFFF0FFF;
if (set_result == 0) { if (set_result == 0.0) {
ppc_state.fpscr |= 0x2000; ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_FPCC_NEG;
} else { } else {
if (set_result < 0) { if (set_result < 0.0) {
ppc_state.fpscr |= 0x8000; ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_FPCC_ZERO;
} else if (set_result > 0) { } else if (set_result > 0.0) {
ppc_state.fpscr |= 0x4000; ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_FPCC_POS;
} else { } else {
ppc_state.fpscr |= 0x1000; ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_FPCC_FPRCD;
} }
} }
} }
} }
void ppc_frsqrte_result() {
if (ppc_result64_d & 0x007FF000000000000UL) {
}
}
void ppc_changecrf1() { void ppc_changecrf1() {
ppc_state.cr &= 0xF0FFFFFF; ppc_state.cr &= 0xF0FFFFFF;
ppc_state.cr |= (ppc_state.fpscr & 0xF0000000) >> 4; ppc_state.cr |= (ppc_state.fpscr & 0xF0000000) >> 4;
@ -323,7 +298,7 @@ void ppc_changecrf1() {
void dppc_interpreter::ppc_fadd() { void dppc_interpreter::ppc_fadd() {
ppc_grab_regsfpdab(); ppc_grab_regsfpdab();
if (!ppc_confirm_inf_nan(reg_a, reg_b, false, 58)) { if (!ppc_confirm_inf_nan<double>(reg_a, reg_b, 0, FPOP::ADD)) {
ppc_dblresult64_d = val_reg_a + val_reg_b; ppc_dblresult64_d = val_reg_a + val_reg_b;
ppc_store_dfpresult_flt(reg_d); ppc_store_dfpresult_flt(reg_d);
} }
@ -335,7 +310,7 @@ void dppc_interpreter::ppc_fadd() {
void dppc_interpreter::ppc_fsub() { void dppc_interpreter::ppc_fsub() {
ppc_grab_regsfpdab(); ppc_grab_regsfpdab();
if (!ppc_confirm_inf_nan(reg_a, reg_b, false, 56)) { if (!ppc_confirm_inf_nan<double>(reg_a, reg_b, 0, FPOP::SUB)) {
ppc_dblresult64_d = val_reg_a - val_reg_b; ppc_dblresult64_d = val_reg_a - val_reg_b;
ppc_store_dfpresult_flt(reg_d); ppc_store_dfpresult_flt(reg_d);
} }
@ -347,7 +322,7 @@ void dppc_interpreter::ppc_fsub() {
void dppc_interpreter::ppc_fdiv() { void dppc_interpreter::ppc_fdiv() {
ppc_grab_regsfpdab(); ppc_grab_regsfpdab();
if (!ppc_confirm_inf_nan(reg_a, reg_b, false, 36)) { if (!ppc_confirm_inf_nan<double>(reg_a, reg_b, 0, FPOP::DIV)) {
ppc_dblresult64_d = val_reg_a / val_reg_b; ppc_dblresult64_d = val_reg_a / val_reg_b;
ppc_store_dfpresult_flt(reg_d); ppc_store_dfpresult_flt(reg_d);
} }
@ -359,7 +334,7 @@ void dppc_interpreter::ppc_fdiv() {
void dppc_interpreter::ppc_fmul() { void dppc_interpreter::ppc_fmul() {
ppc_grab_regsfpdac(); ppc_grab_regsfpdac();
if (!ppc_confirm_inf_nan(reg_a, reg_c, false, 50)) { if (!ppc_confirm_inf_nan<double>(reg_a, reg_c, 0, FPOP::MUL)) {
ppc_dblresult64_d = val_reg_a * val_reg_c; ppc_dblresult64_d = val_reg_a * val_reg_c;
ppc_store_dfpresult_flt(reg_d); ppc_store_dfpresult_flt(reg_d);
} }
@ -371,14 +346,11 @@ void dppc_interpreter::ppc_fmul() {
void dppc_interpreter::ppc_fmadd() { void dppc_interpreter::ppc_fmadd() {
ppc_grab_regsfpdabc(); ppc_grab_regsfpdabc();
if (!ppc_confirm_inf_nan(reg_a, reg_c, false, 50)) { if (!ppc_confirm_inf_nan<double>(reg_a, reg_b, reg_c, FPOP::FMADD)) {
ppc_dblresult64_d = (val_reg_a * val_reg_c); ppc_dblresult64_d = std::fma(val_reg_a, val_reg_c, val_reg_b);
if (!ppc_confirm_inf_nan(reg_a, reg_b, false, 58)) { ppc_store_dfpresult_flt(reg_d);
ppc_dblresult64_d += val_reg_b;
}
} }
ppc_store_dfpresult_flt(reg_d);
if (rc_flag) if (rc_flag)
ppc_changecrf1(); ppc_changecrf1();
@ -387,14 +359,12 @@ void dppc_interpreter::ppc_fmadd() {
void dppc_interpreter::ppc_fmsub() { void dppc_interpreter::ppc_fmsub() {
ppc_grab_regsfpdabc(); ppc_grab_regsfpdabc();
if (!ppc_confirm_inf_nan(reg_a, reg_c, false, 50)) { if (!ppc_confirm_inf_nan<double>(reg_a, reg_b, reg_c, FPOP::FMSUB)) {
ppc_dblresult64_d = (val_reg_a * val_reg_c); ppc_dblresult64_d = (val_reg_a * val_reg_c);
if (!ppc_confirm_inf_nan(reg_d, reg_b, false, 56)) {
ppc_dblresult64_d -= val_reg_b; ppc_dblresult64_d -= val_reg_b;
} ppc_store_dfpresult_flt(reg_d);
} }
ppc_store_dfpresult_flt(reg_d);
if (rc_flag) if (rc_flag)
ppc_changecrf1(); ppc_changecrf1();
@ -403,15 +373,12 @@ void dppc_interpreter::ppc_fmsub() {
void dppc_interpreter::ppc_fnmadd() { void dppc_interpreter::ppc_fnmadd() {
ppc_grab_regsfpdabc(); ppc_grab_regsfpdabc();
if (!ppc_confirm_inf_nan(reg_a, reg_c, false, 50)) { if (!ppc_confirm_inf_nan<double>(reg_a, reg_b, reg_c, FPOP::FNMADD)) {
ppc_dblresult64_d = (val_reg_a * val_reg_c); ppc_dblresult64_d = (val_reg_a * val_reg_c);
if (!ppc_confirm_inf_nan(reg_a, reg_b, false, 58)) {
ppc_dblresult64_d += val_reg_b; ppc_dblresult64_d += val_reg_b;
}
}
ppc_dblresult64_d = -ppc_dblresult64_d; ppc_dblresult64_d = -ppc_dblresult64_d;
ppc_store_dfpresult_flt(reg_d); ppc_store_dfpresult_flt(reg_d);
}
if (rc_flag) if (rc_flag)
ppc_changecrf1(); ppc_changecrf1();
@ -420,15 +387,12 @@ void dppc_interpreter::ppc_fnmadd() {
void dppc_interpreter::ppc_fnmsub() { void dppc_interpreter::ppc_fnmsub() {
ppc_grab_regsfpdabc(); ppc_grab_regsfpdabc();
if (!ppc_confirm_inf_nan(reg_a, reg_c, false, 50)) { if (!ppc_confirm_inf_nan<double>(reg_a, reg_b, reg_c, FPOP::FNMSUB)) {
ppc_dblresult64_d = (val_reg_a * val_reg_c); ppc_dblresult64_d = (val_reg_a * val_reg_c);
if (!ppc_confirm_inf_nan(reg_d, reg_b, false, 56)) {
ppc_dblresult64_d -= val_reg_b; ppc_dblresult64_d -= val_reg_b;
}
}
ppc_dblresult64_d = -ppc_dblresult64_d;
ppc_store_dfpresult_flt(reg_d); ppc_store_dfpresult_flt(reg_d);
}
if (rc_flag) if (rc_flag)
ppc_changecrf1(); ppc_changecrf1();
@ -437,7 +401,7 @@ void dppc_interpreter::ppc_fnmsub() {
void dppc_interpreter::ppc_fadds() { void dppc_interpreter::ppc_fadds() {
ppc_grab_regsfpdab(); ppc_grab_regsfpdab();
if (!ppc_confirm_inf_nan(reg_a, reg_b, true, 58)) { if (!ppc_confirm_inf_nan<float>(reg_a, reg_b, 0, FPOP::ADD)) {
float intermediate = (float)val_reg_a + (float)val_reg_b; float intermediate = (float)val_reg_a + (float)val_reg_b;
ppc_dblresult64_d = static_cast<double>(intermediate); ppc_dblresult64_d = static_cast<double>(intermediate);
ppc_store_sfpresult_flt(reg_d); ppc_store_sfpresult_flt(reg_d);
@ -450,7 +414,7 @@ void dppc_interpreter::ppc_fadds() {
void dppc_interpreter::ppc_fsubs() { void dppc_interpreter::ppc_fsubs() {
ppc_grab_regsfpdab(); ppc_grab_regsfpdab();
if (!ppc_confirm_inf_nan(reg_a, reg_b, true, 56)) { if (!ppc_confirm_inf_nan<float>(reg_a, reg_b, 0, FPOP::SUB)) {
float intermediate = (float)val_reg_a - (float)val_reg_b; float intermediate = (float)val_reg_a - (float)val_reg_b;
ppc_dblresult64_d = static_cast<double>(intermediate); ppc_dblresult64_d = static_cast<double>(intermediate);
ppc_store_sfpresult_flt(reg_d); ppc_store_sfpresult_flt(reg_d);
@ -463,7 +427,7 @@ void dppc_interpreter::ppc_fsubs() {
void dppc_interpreter::ppc_fmuls() { void dppc_interpreter::ppc_fmuls() {
ppc_grab_regsfpdac(); ppc_grab_regsfpdac();
if (!ppc_confirm_inf_nan(reg_a, reg_c, true, 50)) { if (!ppc_confirm_inf_nan<float>(reg_a, 0, reg_c, FPOP::MUL)) {
float intermediate = (float)val_reg_a * (float)val_reg_c; float intermediate = (float)val_reg_a * (float)val_reg_c;
ppc_dblresult64_d = static_cast<double>(intermediate); ppc_dblresult64_d = static_cast<double>(intermediate);
ppc_store_sfpresult_flt(reg_d); ppc_store_sfpresult_flt(reg_d);
@ -476,7 +440,7 @@ void dppc_interpreter::ppc_fmuls() {
void dppc_interpreter::ppc_fdivs() { void dppc_interpreter::ppc_fdivs() {
ppc_grab_regsfpdab(); ppc_grab_regsfpdab();
if (!ppc_confirm_inf_nan(reg_a, reg_b, true, 36)) { if (!ppc_confirm_inf_nan<float>(reg_a, reg_b, 0, FPOP::DIV)) {
float intermediate = (float)val_reg_a / (float)val_reg_b; float intermediate = (float)val_reg_a / (float)val_reg_b;
ppc_dblresult64_d = static_cast<double>(intermediate); ppc_dblresult64_d = static_cast<double>(intermediate);
ppc_store_sfpresult_flt(reg_d); ppc_store_sfpresult_flt(reg_d);
@ -491,15 +455,12 @@ void dppc_interpreter::ppc_fmadds() {
float intermediate; float intermediate;
if (!ppc_confirm_inf_nan(reg_a, reg_b, true, 58)) { if (!ppc_confirm_inf_nan<float>(reg_a, reg_b, reg_c, FPOP::FMADD)) {
intermediate = (float)val_reg_a * (float)val_reg_c; ppc_dblresult64_d = static_cast<double>(std::fma(
if (!ppc_confirm_inf_nan(reg_a, reg_b, true, 58)) { (float)val_reg_a, (float)val_reg_c, (float)val_reg_b));
intermediate += (float)val_reg_b;
ppc_dblresult64_d = static_cast<double>(intermediate);
ppc_store_sfpresult_flt(reg_d); ppc_store_sfpresult_flt(reg_d);
} }
}
if (rc_flag) if (rc_flag)
ppc_changecrf1(); ppc_changecrf1();
@ -510,15 +471,13 @@ void dppc_interpreter::ppc_fmsubs() {
float intermediate; float intermediate;
if (!ppc_confirm_inf_nan(reg_a, reg_c, false, 50)) { if (!ppc_confirm_inf_nan<float>(reg_a, reg_b, reg_c, FPOP::FMSUB)) {
intermediate = (float)val_reg_a * (float)val_reg_c; intermediate = (float)val_reg_a * (float)val_reg_c;
if (!ppc_confirm_inf_nan(reg_d, reg_b, false, 56)) {
intermediate -= (float)val_reg_b; intermediate -= (float)val_reg_b;
ppc_dblresult64_d = static_cast<double>(intermediate); ppc_dblresult64_d = static_cast<double>(intermediate);
ppc_store_sfpresult_flt(reg_d); ppc_store_sfpresult_flt(reg_d);
} }
}
if (rc_flag) if (rc_flag)
ppc_changecrf1(); ppc_changecrf1();
@ -529,9 +488,8 @@ void dppc_interpreter::ppc_fnmadds() {
float intermediate; float intermediate;
if (!ppc_confirm_inf_nan(reg_a, reg_b, true, 58)) { if (!ppc_confirm_inf_nan<float>(reg_a, reg_b, reg_c, FPOP::FNMADD)) {
intermediate = (float)val_reg_a * (float)val_reg_c; intermediate = (float)val_reg_a * (float)val_reg_c;
if (!ppc_confirm_inf_nan(reg_a, reg_b, true, 58)) {
intermediate += (float)val_reg_b; intermediate += (float)val_reg_b;
intermediate = -intermediate; intermediate = -intermediate;
@ -539,7 +497,6 @@ void dppc_interpreter::ppc_fnmadds() {
ppc_store_sfpresult_flt(reg_d); ppc_store_sfpresult_flt(reg_d);
} }
}
if (rc_flag) if (rc_flag)
ppc_changecrf1(); ppc_changecrf1();
@ -550,9 +507,8 @@ void dppc_interpreter::ppc_fnmsubs() {
float intermediate; float intermediate;
if (!ppc_confirm_inf_nan(reg_a, reg_c, false, 50)) { if (!ppc_confirm_inf_nan<float>(reg_a, reg_b, reg_c, FPOP::FNMSUB)) {
intermediate = (float)val_reg_a * (float)val_reg_c; intermediate = (float)val_reg_a * (float)val_reg_c;
if (!ppc_confirm_inf_nan(reg_d, reg_b, false, 56)) {
intermediate -= (float)val_reg_b; intermediate -= (float)val_reg_b;
intermediate = -intermediate; intermediate = -intermediate;
@ -560,7 +516,6 @@ void dppc_interpreter::ppc_fnmsubs() {
ppc_store_sfpresult_flt(reg_d); ppc_store_sfpresult_flt(reg_d);
} }
}
if (rc_flag) if (rc_flag)
ppc_changecrf1(); ppc_changecrf1();
@ -687,12 +642,16 @@ void dppc_interpreter::ppc_fctiw() {
switch (ppc_state.fpscr & 0x3) { switch (ppc_state.fpscr & 0x3) {
case 0: case 0:
ppc_result64_d = round_to_nearest(val_reg_b); ppc_result64_d = round_to_nearest(val_reg_b);
break;
case 1: case 1:
ppc_result64_d = round_to_zero(val_reg_b); ppc_result64_d = round_to_zero(val_reg_b);
break;
case 2: case 2:
ppc_result64_d = round_to_pos_inf(val_reg_b); ppc_result64_d = round_to_pos_inf(val_reg_b);
break;
case 3: case 3:
ppc_result64_d = round_to_neg_inf(val_reg_b); ppc_result64_d = round_to_neg_inf(val_reg_b);
break;
} }
ppc_store_dfpresult_int(reg_d); ppc_store_dfpresult_int(reg_d);
@ -1027,25 +986,28 @@ void dppc_interpreter::ppc_fcmpo() {
ppc_state.fpscr &= 0xFFFF0FFF; ppc_state.fpscr &= 0xFFFF0FFF;
if (std::isnan(db_test_a) || std::isnan(db_test_b)) { if (std::isnan(db_test_a) || std::isnan(db_test_b)) {
cmp_c |= 0x01; cmp_c |= (1 << (uint32_t)CRx_bit::CR_SO);
} else if (db_test_a < db_test_b) { } else if (db_test_a < db_test_b) {
cmp_c |= 0x08; cmp_c |= (1 << (uint32_t)CRx_bit::CR_LT);
} else if (db_test_a > db_test_b) { } else if (db_test_a > db_test_b) {
cmp_c |= 0x04; cmp_c |= (1 << (uint32_t)CRx_bit::CR_GT);
} else { } else {
cmp_c |= 0x02; cmp_c |= (1 << (uint32_t)CRx_bit::CR_EQ);
} }
ppc_state.fpscr |= (cmp_c << 12); fpresult_update(db_test_a, true);
ppc_state.cr = ((ppc_state.cr & ~(0xf0000000 >> crf_d)) | ((cmp_c + xercon) >> crf_d));
if ((db_test_a == snan) || (db_test_b == snan)) { ppc_state.fpscr = (ppc_state.fpscr & ~((uint32_t)FPSCR_bit::FPSCR_FPRF)) | (cmp_c << 12);
ppc_state.fpscr |= 0x1000000; ppc_state.cr =
((ppc_state.cr & ~((uint32_t)CR_select::CR0_field >> crf_d)) | ((cmp_c + xercon) >> crf_d));
if (std::isnan(db_test_a) || std::isnan(db_test_b)) {
ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_VXSNAN;
if (ppc_state.fpscr & 0x80) { if (ppc_state.fpscr & 0x80) {
ppc_state.fpscr |= 0x80000; ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_VXVC;
} }
} else if ((db_test_a == qnan) || (db_test_b == qnan)) { } else if ((db_test_a == qnan) || (db_test_b == qnan)) {
ppc_state.fpscr |= 0x80000; ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_VXVC;
} }
} }
@ -1055,19 +1017,22 @@ void dppc_interpreter::ppc_fcmpu() {
ppc_state.fpscr &= 0xFFFF0FFF; ppc_state.fpscr &= 0xFFFF0FFF;
if (std::isnan(db_test_a) || std::isnan(db_test_b)) { if (std::isnan(db_test_a) || std::isnan(db_test_b)) {
cmp_c |= 0x01; cmp_c |= (1 << (uint32_t)CRx_bit::CR_SO);
} else if (db_test_a < db_test_b) { } else if (db_test_a < db_test_b) {
cmp_c |= 0x08; cmp_c |= (1 << (uint32_t)CRx_bit::CR_LT);
} else if (db_test_a > db_test_b) { } else if (db_test_a > db_test_b) {
cmp_c |= 0x04; cmp_c |= (1 << (uint32_t)CRx_bit::CR_GT);
} else { } else {
cmp_c |= 0x02; cmp_c |= (1 << (uint32_t)CRx_bit::CR_EQ);
} }
ppc_state.fpscr |= (cmp_c << 12); fpresult_update(db_test_a, true);
ppc_state.cr = ((ppc_state.cr & ~(0xf0000000 >> crf_d)) | ((cmp_c + xercon) >> crf_d));
if ((db_test_a == snan) || (db_test_b == snan)) { ppc_state.fpscr = (ppc_state.fpscr & ~((uint32_t)FPSCR_bit::FPSCR_FPRF)) | (cmp_c << 12);
ppc_state.fpscr |= 0x1000000; ppc_state.cr =
((ppc_state.cr & ~((uint32_t)CR_select::CR0_field >> crf_d)) | ((cmp_c + xercon) >> crf_d));
if (std::isnan(db_test_a) || std::isnan(db_test_b)) {
ppc_state.fpscr |= (uint32_t)FPSCR_bit::FPSCR_VXSNAN;
} }
} }