jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Renamed Linker::align() to alignCode(). We still have to add

Browse Source 
some way to express alignData().
This commit is contained in:
Markus F.X.J. Oberhumer
2006-08-28 08:58:43 +02:00
parent 4ffde4db98
commit 6c519c237e
2 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/linker.cpp
+5 -9
View File
@@ -317,7 +317,7 @@ int ElfLinker::addLoader(const char *sname)
if (unsigned l = (hex(sect[2]) - tail->offset - tail->size) if (unsigned l = (hex(sect[2]) - tail->offset - tail->size)
% hex(sect[1])) % hex(sect[1]))
{ {
align(l); alignCode(l);
tail->size += l; tail->size += l;
outputlen += l; outputlen += l;
} }
@@ -329,7 +329,7 @@ int ElfLinker::addLoader(const char *sname)
unsigned const v = ~0u << section->align; unsigned const v = ~0u << section->align;
assert(tail); assert(tail);
if (unsigned const l = ~v & -(tail->offset + tail->size)) { if (unsigned const l = ~v & -(tail->offset + tail->size)) {
align(l); alignCode(l);
tail->size += l; tail->size += l;
outputlen += l; outputlen += l;
} }
@@ -457,11 +457,6 @@ void ElfLinker::alignWithByte(unsigned len, upx_byte b)
memset(output + outputlen, b, len); memset(output + outputlen, b, len);
} }
void ElfLinker::align(unsigned len)
{
alignWithByte(len, 0);
}
void ElfLinker::relocate1(const Relocation *rel, upx_byte *, void ElfLinker::relocate1(const Relocation *rel, upx_byte *,
unsigned, const char *) unsigned, const char *)
{ {
@@ -472,6 +467,7 @@ void ElfLinker::relocate1(const Relocation *rel, upx_byte *,
/************************************************************************* /*************************************************************************
// ElfLinker arch subclasses // ElfLinker arch subclasses
// FIXME: add more displacment overflow checks
**************************************************************************/ **************************************************************************/
void ElfLinkerAMD64::relocate1(const Relocation *rel, upx_byte *location, void ElfLinkerAMD64::relocate1(const Relocation *rel, upx_byte *location,
@@ -490,7 +486,7 @@ void ElfLinkerAMD64::relocate1(const Relocation *rel, upx_byte *location,
if (strcmp(type, "8") == 0) if (strcmp(type, "8") == 0)
{ {
int displ = (signed char) *location + (int) value; int displ = (signed char) *location + (int) value;
if (displ < -127 || displ > 128) if (displ < -128 || displ > 127)
{ {
printf("target out of range (%d) in reloc %s:%x\n", printf("target out of range (%d) in reloc %s:%x\n",
displ, rel->section->name, rel->offset); displ, rel->section->name, rel->offset);
@@ -645,7 +641,7 @@ void ElfLinkerX86::relocate1(const Relocation *rel, upx_byte *location,
if (strcmp(type, "8") == 0) if (strcmp(type, "8") == 0)
{ {
int displ = (signed char) *location + (int) value; int displ = (signed char) *location + (int) value;
if (range_check && (displ < -127 || displ > 128)) { if (range_check && (displ < -128 || displ > 127)) {
printf("target out of range (%d) in reloc %s:%x\n", printf("target out of range (%d) in reloc %s:%x\n",
displ, rel->section->name, rel->offset); displ, rel->section->name, rel->offset);
abort(); abort();
src/linker.h
+5 -3
View File
@@ -88,7 +88,9 @@ public:
virtual unsigned getSymbolOffset(const char *) const; virtual unsigned getSymbolOffset(const char *) const;
void alignWithByte(unsigned len, upx_byte b); void alignWithByte(unsigned len, upx_byte b);
virtual void align(unsigned len); virtual void alignCode(unsigned len) { alignWithByte(len, 0); }
virtual void alignData(unsigned len) { alignWithByte(len, 0); }
virtual void relocate1(const Relocation *, upx_byte *location, virtual void relocate1(const Relocation *, upx_byte *location,
unsigned value, const char *type); unsigned value, const char *type);
}; };
@@ -141,7 +143,7 @@ class ElfLinkerAMD64 : public ElfLinker
{ {
typedef ElfLinker super; typedef ElfLinker super;
protected: protected:
virtual void align(unsigned len) { alignWithByte(len, 0x90); } virtual void alignCode(unsigned len) { alignWithByte(len, 0x90); }
virtual void relocate1(const Relocation *, upx_byte *location, virtual void relocate1(const Relocation *, upx_byte *location,
unsigned value, const char *type); unsigned value, const char *type);
}; };
@@ -187,7 +189,7 @@ class ElfLinkerX86 : public ElfLinker
{ {
typedef ElfLinker super; typedef ElfLinker super;
protected: protected:
virtual void align(unsigned len) { alignWithByte(len, 0x90); } virtual void alignCode(unsigned len) { alignWithByte(len, 0x90); }
virtual void relocate1(const Relocation *, upx_byte *location, virtual void relocate1(const Relocation *, upx_byte *location,
unsigned value, const char *type); unsigned value, const char *type);
}; };