6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-06-21 18:24:23 +00:00
Code Issues Projects Releases Wiki Activity

RuntimeDyld: Fix up r169178. MSVC doesn't like "or".

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@169183 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
NAKAMURA Takumi
2012-12-04 00:08:14 +00:00
parent c811976b04
commit 4af1ca5229
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/ExecutionEngine/RuntimeDyld/RuntimeDyld.cpp
View File

@ -347,7 +347,7 @@ uint8_t *RuntimeDyldImpl::createStubFunction(uint8_t *Addr) {
uint32_t *StubAddr = (uint32_t*)Addr; uint32_t *StubAddr = (uint32_t*)Addr;
*StubAddr = 0xe51ff004; // ldr pc,<label> *StubAddr = 0xe51ff004; // ldr pc,<label>
return (uint8_t*)++StubAddr; return (uint8_t*)++StubAddr;
} else if (Arch == Triple::mipsel or Arch == Triple::mips) { } else if (Arch == Triple::mipsel || Arch == Triple::mips) {
uint32_t *StubAddr = (uint32_t*)Addr; uint32_t *StubAddr = (uint32_t*)Addr;
// 0: 3c190000 lui t9,%hi(addr). // 0: 3c190000 lui t9,%hi(addr).
// 4: 27390000 addiu t9,t9,%lo(addr). // 4: 27390000 addiu t9,t9,%lo(addr).

2
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldImpl.h
View File

@ -168,7 +168,7 @@ protected:
inline unsigned getMaxStubSize() { inline unsigned getMaxStubSize() {
if (Arch == Triple::arm || Arch == Triple::thumb) if (Arch == Triple::arm || Arch == Triple::thumb)
return 8; // 32-bit instruction and 32-bit address return 8; // 32-bit instruction and 32-bit address
else if (Arch == Triple::mipsel or Arch == Triple::mips) else if (Arch == Triple::mipsel || Arch == Triple::mips)
return 16; return 16;
else if (Arch == Triple::ppc64) else if (Arch == Triple::ppc64)
return 44; return 44;