Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-31 20:02:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[OBJ2BIN] Add support for IMAGE_REL_I386_REL16

Browse source 
Also return error in case of unknown relocation type.
This commit is contained in:
Hervé Poussineau 2021-02-22 10:06:20 +01:00
parent 5367ae5760
commit 77d69c68b8
2 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sdk/include/host/pecoff.h
View file

@ -42,6 +42,7 @@
#define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16 #define IMAGE_NUMBEROF_DIRECTORY_ENTRIES 16
#define IMAGE_REL_I386_ABSOLUTE 0x0001 #define IMAGE_REL_I386_ABSOLUTE 0x0001
#define IMAGE_REL_I386_REL16 0x0002
#define IMAGE_REL_I386_DIR32 0x0006 #define IMAGE_REL_I386_DIR32 0x0006
#pragma pack(push,2) #pragma pack(push,2)

19
sdk/tools/obj2bin/obj2bin.c
View file

@ -13,7 +13,7 @@ Usage(void)
} }
static static
void int
RelocateSection( RelocateSection(
char *pData, char *pData,
IMAGE_SECTION_HEADER *pSectionHeader, IMAGE_SECTION_HEADER *pSectionHeader,
@ -46,6 +46,11 @@ RelocateSection(
*p16 += (WORD)(pSymbols[pReloc->SymbolTableIndex].Value + iOffset); *p16 += (WORD)(pSymbols[pReloc->SymbolTableIndex].Value + iOffset);
break; break;
case IMAGE_REL_I386_REL16:
p16 = (void*)(pSection + nOffset);
*p16 += (WORD)(pSymbols[pReloc->SymbolTableIndex].Value + iOffset);
break;
case IMAGE_REL_I386_DIR32: case IMAGE_REL_I386_DIR32:
p32 = (void*)(pSection + nOffset); p32 = (void*)(pSection + nOffset);
*p32 += (DWORD)(pSymbols[pReloc->SymbolTableIndex].Value + iOffset); *p32 += (DWORD)(pSymbols[pReloc->SymbolTableIndex].Value + iOffset);
@ -54,10 +59,13 @@ RelocateSection(
default: default:
printf("Unknown relocation type %u, address 0x%x\n", printf("Unknown relocation type %u, address 0x%x\n",
pReloc->Type, (unsigned)pReloc->VirtualAddress); pReloc->Type, (unsigned)pReloc->VirtualAddress);
return 0;
} }
pReloc++; pReloc++;
} }
return 1;
} }
int main(int argc, char *argv[]) int main(int argc, char *argv[])
@ -136,10 +144,15 @@ int main(int argc, char *argv[])
if ((strcmp((char*)pSectionHeader->Name, ".text") == 0) && if ((strcmp((char*)pSectionHeader->Name, ".text") == 0) &&
(pSectionHeader->SizeOfRawData != 0)) (pSectionHeader->SizeOfRawData != 0))
{ {
RelocateSection(pData, if (!RelocateSection(pData,
pSectionHeader, pSectionHeader,
pSymbols, pSymbols,
nBaseAddress); nBaseAddress))
{
free(pData);
fclose(pDestFile);
return -7;
}
/* Write the section to the destination file */ /* Write the section to the destination file */
if (!fwrite(pData + pSectionHeader->PointerToRawData, if (!fwrite(pData + pSectionHeader->PointerToRawData,