wip

FEX-Emu · Mar 5, 2024 · 9c16415 · 9c16415
1 parent ff02dd9
commit 9c16415
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/FEXCore/Source/Interface/IR/Passes/ConstProp.cpp b/FEXCore/Source/Interface/IR/Passes/ConstProp.cpp
@@ -101,7 +101,7 @@ MemExtendedAddressing(IREmitter *IREmit, uint8_t AccessSize,
   LOGMAN_THROW_A_FMT(AddressHeader->Op == OP_ADD, "Invalid address Op");
   auto Src0Header = IREmit->GetOpHeader(AddressHeader->Args[0]);
   if (Src0Header->Size == 8) {
-    //Try to optimize: Base + MUL(Offset, Scale)
+    // Try to optimize: Base + MUL(Offset, Scale)
     if (Src0Header->Op == OP_MUL) {
       uint64_t Scale;
       if (IREmit->IsValueConstant(Src0Header->Args[1], &Scale)) {
@@ -119,7 +119,7 @@ MemExtendedAddressing(IREmitter *IREmit, uint8_t AccessSize,
         }
       }
     }
-    //Try to optimize: Base + LSHL(Offset, Scale)
+    // Try to optimize: Base + LSHL(Offset, Scale)
     else if (Src0Header->Op == OP_LSHL) {
       uint64_t Constant2;
       if (IREmit->IsValueConstant(Src0Header->Args[1], &Constant2)) {
@@ -139,7 +139,7 @@ MemExtendedAddressing(IREmitter *IREmit, uint8_t AccessSize,
       }
     }
 #if defined(_M_ARM_64) // x86 can't sext or zext on mem ops
-    //Try to optimize: Base + (u32)Offset
+    // Try to optimize: Base + (u32)Offset
     else if (Src0Header->Op == OP_BFE) {
       auto Bfe = Src0Header->C<IROp_Bfe>();
       if (Bfe->lsb == 0 && Bfe->Width == 32) {
@@ -149,11 +149,11 @@ MemExtendedAddressing(IREmitter *IREmit, uint8_t AccessSize,
             IREmit->UnwrapNode(Src0Header->Args[0])));
       }
     }
-    //Try to optimize: Base + (s32)Offset
+    // Try to optimize: Base + (s32)Offset
     else if (Src0Header->Op == OP_SBFE) {
       auto Sbfe = Src0Header->C<IROp_Sbfe>();
       if (Sbfe->lsb == 0 && Sbfe->Width == 32) {
-        //todo: arm can also scale here
+        // todo: arm can also scale here
         return std::make_optional(std::make_tuple(
             MEM_OFFSET_SXTW, 1, IREmit->UnwrapNode(AddressHeader->Args[1]),
             IREmit->UnwrapNode(Src0Header->Args[0])));
@@ -180,7 +180,7 @@ MemExtendedAddressing(IREmitter *IREmit, uint8_t AccessSize,
 
     if (Val32 > -16384 && Val32 < 0) {
       return std::make_optional(std::make_tuple(MEM_OFFSET_SXTW, 1, Base, Cnt));
-    } else if (Val32 < 16384) {
+    } else if (Val32 >= 0 && Val32 < 16384) {
       return std::make_optional(std::make_tuple(MEM_OFFSET_SXTX, 1, Base, Cnt));
     }
   } else if (AddressHeader->Size == 4) {