Shift base relocation virtualAddress if needed

tuxuser · Jul 22, 2014 · 90d820d · 90d820d
1 parent ffb0735
commit 90d820d
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/OZMTool/util.cpp b/OZMTool/util.cpp
@@ -562,16 +562,24 @@ UINT8 injectDSDTintoAmiboardInfo(QByteArray ami, QByteArray dsdtbuf, QByteArray
 
             baseRelocAddr += EFI_IMAGE_SIZEOF_BASE_RELOCATION + (physEntries * EFI_IMAGE_SIZEOF_RELOC_ENTRY);
             dataLeft -= (physEntries * EFI_IMAGE_SIZEOF_RELOC_ENTRY) + EFI_IMAGE_SIZEOF_BASE_RELOCATION;
-            index++;
+
 
             printf(" - Relocation Table %X:\n", index);
+            index++;
 
             if(BASE_RELOCATION->VirtualAddress < (UINT32)offset) {
                 printf("\tNothing to do here - VirtualAddress < DSDTOffset (%X < %X)\n",
                                 BASE_RELOCATION->VirtualAddress, offset);
                 continue;
             }
 
+            //Testing first relocation entry should be good..
+            UINT32 shiftBy = ((UINT32)RELOCATION_ENTRIES[0].offset + alignDiffDSDT) & 0xF000;
+
+            printf(" - VirtualAddress: %X --> %X\n",
+                    BASE_RELOCATION->VirtualAddress,
+                    BASE_RELOCATION->VirtualAddress += shiftBy);
+
             for(int j=0; j<logicalEntries; j++) {
                 printf(" - Relocation: %X\n", j);
                 printf("\tOffset: %X --> %X\n",