diff options
| author | Matthew Hoops | 2011-07-20 09:27:39 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-07-20 09:27:39 -0400 |
| commit | ad293b249e74dd1cfbdbd721d02145efbdaf9eca (patch) | |
| tree | e568d96f6d7f64c5e58b4c7cd1c4fda7e649bfc7 /backends/plugins/elf/mips-loader.cpp | |
| parent | d7411acc2b1c7702280dbff1c3e1bafee528184b (diff) | |
| parent | e25e85fbb047fef895ede97c3c2c73451631052c (diff) | |
| download | scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.tar.gz scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.tar.bz2 scummvm-rg350-ad293b249e74dd1cfbdbd721d02145efbdaf9eca.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'backends/plugins/elf/mips-loader.cpp')
| -rw-r--r-- | backends/plugins/elf/mips-loader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/backends/plugins/elf/mips-loader.cpp b/backends/plugins/elf/mips-loader.cpp index 8ce1a69583..e043c9647f 100644 --- a/backends/plugins/elf/mips-loader.cpp +++ b/backends/plugins/elf/mips-loader.cpp @@ -53,7 +53,7 @@ bool MIPSDLObject::relocate(Elf32_Off offset, Elf32_Word size, byte *relSegment) debug(2, "elfloader: Loaded relocation table. %d entries. base address=%p", cnt, relSegment); Elf32_Addr adjustedMainSegment = Elf32_Addr(_segment) - _segmentVMA; // adjust for VMA offset - + bool seenHi16 = false; // For treating HI/LO16 commands int32 firstHi16 = -1; // Mark the point of the first hi16 seen Elf32_Addr ahl = 0; // Calculated addend @@ -259,7 +259,7 @@ void MIPSDLObject::relocateSymbols(ptrdiff_t offset) { if (!ShortsMan.inGeneralSegment((char *)s->st_value)) { if (s->st_value < _segmentVMA) s->st_value = _segmentVMA; // deal with symbols referring to sections, which start before the VMA - + s->st_value += offset; if (s->st_value < Elf32_Addr(_segment) || s->st_value > Elf32_Addr(_segment) + _segmentSize) @@ -287,7 +287,7 @@ bool MIPSDLObject::loadSegment(Elf32_Phdr *phdr) { } debug(2, "elfloader: Allocated segment @ %p", _segment); - + // Get offset to load segment into baseAddress = _segment; _segmentSize = phdr->p_memsz; |