Fixed relocations in rare cases (for sysmem.prx)

pspdev · Feb 18, 2012 · 647a957 · 647a957
1 parent 05bd70e
commit 647a957
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/ProcessPrx.C b/ProcessPrx.C
@@ -1541,7 +1541,7 @@ void CProcessPrx::FixupRelocs(u32 dwBase, ImmMap &imms)
  ImmEntry *imm;
 
  loinst = LW(*pData);
- addr = ((s16) (loinst & 0xFFFF)) + dwCurrBase;
+ addr = ((s16) (loinst & 0xFFFF) & 0xFFFF) + dwCurrBase;
  COutput::Printf(LEVEL_DEBUG, "Low at (%08X)\n", dwRealOfs);
 
  imm = new ImmEntry;
@@ -1551,7 +1551,7 @@ void CProcessPrx::FixupRelocs(u32 dwBase, ImmMap &imms)
  imms[dwRealOfs + dwBase] = imm;
 
  loinst &= ~0xFFFF;
- loinst |= (addr & 0xFFFF);
+ loinst |= addr;
  SW(*pData, loinst);
  }
  break;
@@ -1600,6 +1600,9 @@ void CProcessPrx::FixupRelocs(u32 dwBase, ImmMap &imms)
  dwData = dwInst + (dwCurrBase >> 16);
  SW(*pData, dwData);
 
+ if (off & 0x8000)
+ dwInst--;
+
  if ((dwData >> 26) != 2) // not J instruction
  {
  imm = new ImmEntry;