From 3b57fb1d21ef0ecbaecc6931c21b0a3f2abfe78b Mon Sep 17 00:00:00 2001 From: JosJuice Date: Tue, 29 Jun 2021 14:00:58 +0200 Subject: [PATCH] PPCTables: Add new instruction flags for CR --- .../Core/PowerPC/Interpreter/Interpreter_Tables.cpp | 12 ++++++------ Source/Core/Core/PowerPC/PPCTables.h | 11 ++++++++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp index caecbd368a..8b14bb4b1e 100644 --- a/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp +++ b/Source/Core/Core/PowerPC/Interpreter/Interpreter_Tables.cpp @@ -29,7 +29,7 @@ static std::array primarytable = {59, Interpreter::RunTable59, {"RunTable59", OpType::Subtable, 0, 0, 0, 0, 0}}, {63, Interpreter::RunTable63, {"RunTable63", OpType::Subtable, 0, 0, 0, 0, 0}}, - {16, Interpreter::bcx, {"bcx", OpType::Branch, FL_ENDBLOCK, 1, 0, 0, 0}}, + {16, Interpreter::bcx, {"bcx", OpType::Branch, FL_ENDBLOCK | FL_READ_CR_BI, 1, 0, 0, 0}}, {18, Interpreter::bx, {"bx", OpType::Branch, FL_ENDBLOCK, 1, 0, 0, 0}}, {3, Interpreter::twi, {"twi", OpType::System, FL_IN_A | FL_ENDBLOCK, 1, 0, 0, 0}}, @@ -143,8 +143,8 @@ static std::array table4_3 = static std::array table19 = {{ - {528, Interpreter::bcctrx, {"bcctrx", OpType::Branch, FL_ENDBLOCK, 1, 0, 0, 0}}, - {16, Interpreter::bclrx, {"bclrx", OpType::Branch, FL_ENDBLOCK, 1, 0, 0, 0}}, + {528, Interpreter::bcctrx, {"bcctrx", OpType::Branch, FL_ENDBLOCK | FL_READ_CR_BI, 1, 0, 0, 0}}, + {16, Interpreter::bclrx, {"bclrx", OpType::Branch, FL_ENDBLOCK | FL_READ_CR_BI, 1, 0, 0, 0}}, {257, Interpreter::crand, {"crand", OpType::CR, FL_EVIL, 1, 0, 0, 0}}, {129, Interpreter::crandc, {"crandc", OpType::CR, FL_EVIL, 1, 0, 0, 0}}, {289, Interpreter::creqv, {"creqv", OpType::CR, FL_EVIL, 1, 0, 0, 0}}, @@ -155,7 +155,7 @@ static std::array table19 = {193, Interpreter::crxor, {"crxor", OpType::CR, FL_EVIL, 1, 0, 0, 0}}, {150, Interpreter::isync, {"isync", OpType::InstructionCache, FL_EVIL, 1, 0, 0, 0}}, - {0, Interpreter::mcrf, {"mcrf", OpType::System, FL_EVIL | FL_SET_CRn, 1, 0, 0, 0}}, + {0, Interpreter::mcrf, {"mcrf", OpType::System, FL_EVIL | FL_SET_CRn | FL_READ_CRn, 1, 0, 0, 0}}, {50, Interpreter::rfi, {"rfi", OpType::System, FL_ENDBLOCK | FL_CHECKEXCEPTIONS | FL_PROGRAMEXCEPTION, 2, 0, 0, 0}}, }}; @@ -278,9 +278,9 @@ static std::array table31 = {759, Interpreter::stfdux, {"stfdux", OpType::StoreFP, FL_IN_FLOAT_S | FL_IN_AB | FL_OUT_A | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}}, {983, Interpreter::stfiwx, {"stfiwx", OpType::StoreFP, FL_IN_FLOAT_S | FL_IN_A0B | FL_USE_FPU | FL_LOADSTORE, 1, 0, 0, 0}}, - {19, Interpreter::mfcr, {"mfcr", OpType::System, FL_OUT_D, 1, 0, 0, 0}}, + {19, Interpreter::mfcr, {"mfcr", OpType::System, FL_OUT_D | FL_READ_ALL_CR, 1, 0, 0, 0}}, {83, Interpreter::mfmsr, {"mfmsr", OpType::System, FL_OUT_D | FL_PROGRAMEXCEPTION, 1, 0, 0, 0}}, - {144, Interpreter::mtcrf, {"mtcrf", OpType::System, FL_IN_S | FL_SET_CRn, 1, 0, 0, 0}}, + {144, Interpreter::mtcrf, {"mtcrf", OpType::System, FL_IN_S | FL_SET_ALL_CR | FL_READ_ALL_CR, 1, 0, 0, 0}}, {146, Interpreter::mtmsr, {"mtmsr", OpType::System, FL_IN_S | FL_ENDBLOCK | FL_PROGRAMEXCEPTION | FL_FLOAT_EXCEPTION, 1, 0, 0, 0}}, {210, Interpreter::mtsr, {"mtsr", OpType::System, FL_IN_S | FL_PROGRAMEXCEPTION, 1, 0, 0, 0}}, {242, Interpreter::mtsrin, {"mtsrin", OpType::System, FL_IN_SB | FL_PROGRAMEXCEPTION, 1, 0, 0, 0}}, diff --git a/Source/Core/Core/PowerPC/PPCTables.h b/Source/Core/Core/PowerPC/PPCTables.h index f88d5d8ef3..81567a452f 100644 --- a/Source/Core/Core/PowerPC/PPCTables.h +++ b/Source/Core/Core/PowerPC/PPCTables.h @@ -15,8 +15,7 @@ enum InstructionFlags : u64 { FL_SET_CR0 = (1ull << 0), // Sets CR0. FL_SET_CR1 = (1ull << 1), // Sets CR1. - FL_SET_CRn = (1ull << 2), // Encoding decides which CR can be set. - FL_SET_CRx = FL_SET_CR0 | FL_SET_CR1 | FL_SET_CRn, + FL_SET_CRn = (1ull << 2), // Sets a CR determined by the CRFD field. FL_SET_CA = (1ull << 3), // Sets the carry flag. FL_READ_CA = (1ull << 4), // Reads the carry flag. FL_RC_BIT = (1ull << 5), // Sets the record bit. @@ -66,7 +65,13 @@ enum InstructionFlags : u64 FL_IN_FLOAT_BC_BITEXACT = FL_IN_FLOAT_B_BITEXACT | FL_IN_FLOAT_C_BITEXACT, FL_PROGRAMEXCEPTION = (1ull << 32), // May generate a program exception (not floating point). FL_FLOAT_EXCEPTION = (1ull << 33), // May generate a program exception (floating point). - FL_FLOAT_DIV = (1ull << 34), // May generate a program exception (FP) due to division by 0. + FL_FLOAT_DIV = (1ull << 34), // May generate a program exception (FP) due to division by 0. + FL_SET_ALL_CR = (1ull << 35), // Sets every CR. + FL_READ_CRn = (1ull << 36), // Reads a CR determined by the CRFS field. + FL_READ_CR_BI = (1ull << 37), // Reads a CR determined by the BI field. + FL_READ_ALL_CR = (1ull << 38), // Reads every CR. + FL_SET_CRx = FL_SET_CR0 | FL_SET_CR1 | FL_SET_CRn | FL_SET_ALL_CR, + FL_READ_CRx = FL_READ_CRn | FL_READ_CR_BI | FL_READ_ALL_CR, }; enum class OpType