ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-03 17:50:41 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge remote branch 'origin/arm'

Browse Source
This commit is contained in:
Joel Dice 2010-11-16 09:56:35 -07:00
commit 937b7a7d34
13 changed files with 1259 additions and 595 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
makefile
View File

@ -145,8 +145,17 @@ ifeq ($(arch),powerpc)
pointer-size = 4
endif
ifeq ($(arch),arm)
asm = arm
pointer-size = 4
asm = arm
pointer-size = 4
cflags += -Wno-psabi
ifneq ($(arch),$(build-arch))
cxx = arm-linux-gnueabi-g++
cc = arm-linux-gnueabi-gcc
ar = arm-linux-gnueabi-ar
ranlib = arm-linux-gnueabi-ranlib
strip = arm-linux-gnueabi-strip
endif
endif
ifeq ($(platform),darwin)

8
src/arm.S
View File

@ -50,7 +50,9 @@ vmNativeCall:
.globl vmJump
vmJump:
mov lr, r0
ldr r0, [sp]
ldr r1, [sp, #4]
mov sp, r2
mov r4, r3
ldmia sp, {r0,r1}
mov pc, lr
mov r8, r3
bx lr

1467
src/arm.cpp
View File

File diff suppressed because it is too large Load Diff

2
src/arm.h
View File

@ -27,7 +27,7 @@ namespace vm {
inline void
trap()
{
asm("nop");
asm("bkpt");
}
inline void

4
src/assembler.h
View File

@ -418,9 +418,9 @@ class Assembler {
virtual Block* endBlock(bool startNew) = 0;
virtual unsigned length() = 0;
virtual void endEvent() = 0;
virtual unsigned scratchSize() = 0;
virtual unsigned length() = 0;
virtual void dispose() = 0;
};

2
src/binaryToObject/elf.cpp
View File

@ -232,7 +232,7 @@ writeObject(const uint8_t* data, unsigned size, FILE* out,
fileHeader.e_entry = 0;
fileHeader.e_phoff = 0;
fileHeader.e_shoff = sizeof(FileHeader);
fileHeader.e_flags = 0;
fileHeader.e_flags = (machine == EM_ARM ? 0x04000000 : 0);
fileHeader.e_ehsize = sizeof(FileHeader);
fileHeader.e_phentsize = 0;
fileHeader.e_phnum = 0;

264
src/compile-arm.S Normal file
View File

@ -0,0 +1,264 @@
/* Copyright (c) 2010, Avian Contributors
Permission to use, copy, modify, and/or distribute this software
for any purpose with or without fee is hereby granted, provided
that the above copyright notice and this permission notice appear
in all copies.
There is NO WARRANTY for this software. See license.txt for
details. */
#include "types.h"
.text
#define BYTES_PER_WORD 4
#define LOCAL(x) .L##x
#ifdef __APPLE__
# define GLOBAL(x) _##x
#else
# define GLOBAL(x) x
#endif
#define THREAD_STACK 2144
#define THREAD_CONTINUATION 2148
#define THREAD_EXCEPTION 44
#define THREAD_EXCEPTION_STACK_ADJUSTMENT 2152
#define THREAD_EXCEPTION_OFFSET 2156
#define THREAD_EXCEPTION_HANDLER 2160
#define CONTINUATION_NEXT 4
#define CONTINUATION_ADDRESS 16
#define CONTINUATION_RETURN_ADDRESS_OFFSET 20
#define CONTINUATION_FRAME_POINTER_OFFSET 24
#define CONTINUATION_LENGTH 28
#define CONTINUATION_BODY 32
#define ARGUMENT_BASE (BYTES_PER_WORD * 2)
.globl GLOBAL(vmInvoke)
GLOBAL(vmInvoke):
/*
arguments
r0 : thread
r1 : function
r2 : arguments
r3 : argumentFootprint
[sp, #0] : frameSize (not used)
[sp, #4] : returnType
*/
// save stack frame
mov ip, sp
// save all non-volatile registers
stmfd sp!, {r4-r11, lr}
// save return type
ldr r4, [ip, #4]
str r4, [sp, #-4]!
// we're at the bottom of our local stack frame; save it
mov ip, sp
// align stack, if necessary
eor r4, sp, r3
tst r4, #4
subne sp, sp, #4
// copy arguments into place
sub sp, r3
mov r4, #0
b LOCAL(vmInvoke_argumentTest)
LOCAL(vmInvoke_argumentLoop):
ldr r5, [r2, r4]
str r5, [sp, r4]
add r4, r4, #BYTES_PER_WORD
LOCAL(vmInvoke_argumentTest):
cmp r4, r3
blt LOCAL(vmInvoke_argumentLoop)
// save frame
str ip, [sp, #-8]!
// we use r8 to hold the thread pointer, by convention
mov r8, r0
// load and call function address
blx r1
.globl GLOBAL(vmInvoke_returnAddress)
GLOBAL(vmInvoke_returnAddress):
// restore frame
ldr sp, [sp]
.globl GLOBAL(vmInvoke_safeStack)
GLOBAL(vmInvoke_safeStack):
#ifdef AVIAN_CONTINUATIONS
// call the next continuation, if any
ldr r5,[r8,#THREAD_CONTINUATION]
cmp r5,#0
beq LOCAL(vmInvoke_exit)
ldr r6,[r5,#CONTINUATION_LENGTH]
lsl r6,r6,#2
neg r7,r6
add r7,r7,#-80
mov r4,sp
str r4,[sp,r7]!
add r7,r5,#CONTINUATION_BODY
mov r11,#0
add r10,sp,#ARGUMENT_BASE
b LOCAL(vmInvoke_continuationTest)
LOCAL(vmInvoke_continuationLoop):
ldr r9,[r7,r11]
str r9,[r10,r11]
add r11,r11,#4
LOCAL(vmInvoke_continuationTest):
cmp r11,r6
ble LOCAL(vmInvoke_continuationLoop)
ldr r7,[r5,#CONTINUATION_RETURN_ADDRESS_OFFSET]
ldr r10,LOCAL(vmInvoke_returnAddress_word)
ldr r11,LOCAL(vmInvoke_getAddress_word)
LOCAL(vmInvoke_getAddress):
add r11,pc,r11
ldr r11,[r11,r10]
str r11,[sp,r7]
ldr r7,[r5,#CONTINUATION_FRAME_POINTER_OFFSET]
ldr r11,[sp]
add r7,r7,sp
str r11,[r7]
str r7,[sp]
ldr r7,[r5,#CONTINUATION_NEXT]
str r7,[r8,#THREAD_CONTINUATION]
// call the continuation unless we're handling an exception
ldr r7,[r8,#THREAD_EXCEPTION]
cmp r7,#0
bne LOCAL(vmInvoke_handleException)
ldr r7,[r5,#CONTINUATION_ADDRESS]
bx r7
LOCAL(vmInvoke_handleException):
// we're handling an exception - call the exception handler instead
mov r11,#0
str r11,[r8,#THREAD_EXCEPTION]
ldr r11,[r8,#THREAD_EXCEPTION_STACK_ADJUSTMENT]
ldr r9,[sp]
neg r11,r11
str r9,[sp,r11]!
ldr r11,[r8,#THREAD_EXCEPTION_OFFSET]
str r7,[sp,r11]
ldr r7,[r8,#THREAD_EXCEPTION_HANDLER]
bx r7
LOCAL(vmInvoke_exit):
#endif // AVIAN_CONTINUATIONS
mov ip, #0
str ip, [r8, #THREAD_STACK]
// restore return type
ldr ip, [sp], #4
// restore callee-saved registers
ldmfd sp!, {r4-r11, lr}
LOCAL(vmInvoke_void):
cmp ip, #VOID_TYPE
beq LOCAL(vmInvoke_return)
LOCAL(vmInvoke_int64):
cmp ip, #INT64_TYPE
beq LOCAL(vmInvoke_return)
LOCAL(vmInvoke_int32):
mov r1, #0
LOCAL(vmInvoke_return):
bx lr
.globl GLOBAL(vmJumpAndInvoke)
GLOBAL(vmJumpAndInvoke):
#ifdef AVIAN_CONTINUATIONS
// r0: thread
// r1: address
// r2: (unused)
// r3: stack
// [sp,#0]: argumentFootprint
// [sp,#4]: arguments
// [sp,#8]: frameSize
ldr r4,[sp]
ldr r5,[sp,#4]
ldr r6,[sp,#8]
// restore (pseudo)-stack pointer (we don't want to touch the real
// stack pointer, since we haven't copied the arguments yet)
ldr r3,[r3]
// make everything between sp and r3 one big stack frame while we
// shuffle things around
str r3,[sp]
// allocate new frame, adding room for callee-saved registers
neg r10,r6
add r10,r10,#-80
mov r2,r3
str r2,[r3,r10]!
mov r8,r0
// copy arguments into place
mov r6,#0
add r9,r3,#ARGUMENT_BASE
b LOCAL(vmJumpAndInvoke_argumentTest)
LOCAL(vmJumpAndInvoke_argumentLoop):
ldr r12,[r5,r6]
str r12,[r9,r6]
add r6,r6,#4
LOCAL(vmJumpAndInvoke_argumentTest):
cmp r6,r4
ble LOCAL(vmJumpAndInvoke_argumentLoop)
// the arguments have been copied, so we can set the real stack
// pointer now
mov sp,r3
// set return address to vmInvoke_returnAddress
ldr r10,LOCAL(vmInvoke_returnAddress_word)
ldr r11,LOCAL(vmJumpAndInvoke_getAddress_word)
LOCAL(vmJumpAndInvoke_getAddress):
add r11,pc,r11
ldr lr,[r11,r10]
bx r1
LOCAL(vmInvoke_returnAddress_word):
.word GLOBAL(vmInvoke_returnAddress)(GOT)
LOCAL(vmInvoke_getAddress_word):
.word _GLOBAL_OFFSET_TABLE_-(LOCAL(vmInvoke_getAddress)+8)
LOCAL(vmJumpAndInvoke_getAddress_word):
.word _GLOBAL_OFFSET_TABLE_-(LOCAL(vmJumpAndInvoke_getAddress)+8)
#else // not AVIAN_CONTINUATIONS
// vmJumpAndInvoke should only be called when continuations are
// enabled
bkpt
#endif // not AVIAN_CONTINUATIONS

63
src/compile.cpp
View File

@ -5391,14 +5391,14 @@ codeSingletonSizeInBytes(MyThread*, unsigned codeSizeInBytes)
}
uint8_t*
finish(MyThread* t, Allocator* allocator, Assembler* a, const char* name)
finish(MyThread* t, Allocator* allocator, Assembler* a, const char* name,
unsigned length)
{
uint8_t* start = static_cast<uint8_t*>
(allocator->allocate(pad(a->length())));
uint8_t* start = static_cast<uint8_t*>(allocator->allocate(pad(length)));
a->writeTo(start);
logCompile(t, start, a->length(), 0, name, 0);
logCompile(t, start, length, 0, name, 0);
return start;
}
@ -5995,14 +5995,6 @@ compileMethod2(MyThread* t, void* ip)
t->trace->targetMethod = 0;
}
if (false) {
compile(t, codeAllocator(t), 0, resolveMethod
(t, t->m->loader,
"org/eclipse/swt/widgets/TableItem",
"getBounds",
"(IIZZZZJ)Lorg/eclipse/swt/internal/win32/RECT;"));
}
if (UNLIKELY(t->exception)) {
return 0;
} else {
@ -7485,12 +7477,11 @@ class MyProcessor: public Processor {
if (false) {
compile(static_cast<MyThread*>(t),
local::codeAllocator(static_cast<MyThread*>(t)), 0,
resolveMethod(t, t->m->loader,
"com/ecovate/nat/logic/Cache",
"findInCache",
"(Ljava/lang/String;Ljava/lang/String;JZ)Lcom/ecovate/shared/xmlrpc/Resource;"));
trap();
local::codeAllocator(static_cast<MyThread*>(t)), 0, resolveMethod
(t, t->m->loader,
"org/eclipse/swt/widgets/Display",
"runSettings",
"()Z"));
}
compile(static_cast<MyThread*>(t),
@ -8298,9 +8289,7 @@ compileThunks(MyThread* t, Allocator* allocator, MyProcessor* p)
Assembler::Register result(t->arch->returnLow());
a->apply(Jump, BytesPerWord, RegisterOperand, &result);
a->endBlock(false)->resolve(0, 0);
p->thunks.default_.length = a->length();
p->thunks.default_.length = a->endBlock(false)->resolve(0, 0);
}
ThunkContext defaultVirtualContext(t, &zone);
@ -8344,9 +8333,7 @@ compileThunks(MyThread* t, Allocator* allocator, MyProcessor* p)
Assembler::Register result(t->arch->returnLow());
a->apply(Jump, BytesPerWord, RegisterOperand, &result);
a->endBlock(false)->resolve(0, 0);
p->thunks.defaultVirtual.length = a->length();
p->thunks.defaultVirtual.length = a->endBlock(false)->resolve(0, 0);
}
ThunkContext nativeContext(t, &zone);
@ -8365,9 +8352,7 @@ compileThunks(MyThread* t, Allocator* allocator, MyProcessor* p)
a->popFrameAndUpdateStackAndReturn(difference(&(t->stack), t));
a->endBlock(false)->resolve(0, 0);
p->thunks.native.length = a->length();
p->thunks.native.length = a->endBlock(false)->resolve(0, 0);
}
ThunkContext aioobContext(t, &zone);
@ -8384,9 +8369,7 @@ compileThunks(MyThread* t, Allocator* allocator, MyProcessor* p)
Assembler::Constant proc(&(aioobContext.promise));
a->apply(LongCall, BytesPerWord, ConstantOperand, &proc);
a->endBlock(false)->resolve(0, 0);
p->thunks.aioob.length = a->length();
p->thunks.aioob.length = a->endBlock(false)->resolve(0, 0);
}
ThunkContext tableContext(t, &zone);
@ -8400,13 +8383,12 @@ compileThunks(MyThread* t, Allocator* allocator, MyProcessor* p)
Assembler::Constant proc(&(tableContext.promise));
a->apply(LongJump, BytesPerWord, ConstantOperand, &proc);
a->endBlock(false)->resolve(0, 0);
p->thunks.table.length = a->length();
p->thunks.table.length = a->endBlock(false)->resolve(0, 0);
}
p->thunks.default_.start = finish
(t, allocator, defaultContext.context.assembler, "default");
(t, allocator, defaultContext.context.assembler, "default",
p->thunks.default_.length);
BootImage* image = p->bootImage;
uint8_t* imageBase = p->codeAllocator.base;
@ -8421,7 +8403,8 @@ compileThunks(MyThread* t, Allocator* allocator, MyProcessor* p)
}
p->thunks.defaultVirtual.start = finish
(t, allocator, defaultVirtualContext.context.assembler, "defaultVirtual");
(t, allocator, defaultVirtualContext.context.assembler, "defaultVirtual",
p->thunks.defaultVirtual.length);
{ void* call;
defaultVirtualContext.promise.listener->resolve
@ -8434,7 +8417,8 @@ compileThunks(MyThread* t, Allocator* allocator, MyProcessor* p)
}
p->thunks.native.start = finish
(t, allocator, nativeContext.context.assembler, "native");
(t, allocator, nativeContext.context.assembler, "native",
p->thunks.native.length);
{ void* call;
nativeContext.promise.listener->resolve
@ -8446,7 +8430,8 @@ compileThunks(MyThread* t, Allocator* allocator, MyProcessor* p)
}
p->thunks.aioob.start = finish
(t, allocator, aioobContext.context.assembler, "aioob");
(t, allocator, aioobContext.context.assembler, "aioob",
p->thunks.aioob.length);
{ void* call;
aioobContext.promise.listener->resolve
@ -8582,9 +8567,7 @@ compileVirtualThunk(MyThread* t, unsigned index, unsigned* size)
Assembler::Constant thunk(&defaultVirtualThunkPromise);
a->apply(Jump, BytesPerWord, ConstantOperand, &thunk);
a->endBlock(false)->resolve(0, 0);
*size = a->length();
*size = a->endBlock(false)->resolve(0, 0);
uint8_t* start = static_cast<uint8_t*>(codeAllocator(t)->allocate(*size));

8
src/compiler.cpp
View File

@ -4885,10 +4885,14 @@ class BoundsCheckEvent: public Event {
lengthOffset, NoRegister, 1);
length.acquired = true;
index->source->freeze(c, index);
ConstantSite next(nextPromise);
apply(c, JumpIfGreater, 4, index->source, index->source, 4, &length,
&length, BytesPerWord, &next, &next);
index->source->thaw(c, index);
if (constant == 0) {
outOfBoundsPromise->offset = a->offset();
}
@ -5694,6 +5698,8 @@ compile(Context* c)
p->offset = a->offset();
}
a->endEvent();
LogicalInstruction* nextInstruction = next(c, e->logicalInstruction);
if (e->next == 0
or (e->next->logicalInstruction != e->logicalInstruction
@ -5731,7 +5737,7 @@ compile(Context* c)
block = next;
}
return block->assemblerBlock->resolve(block->start, 0) + a->scratchSize();
return block->assemblerBlock->resolve(block->start, 0);
}
unsigned

1
src/posix.cpp
View File

@ -782,6 +782,7 @@ class MySystem: public System {
}
virtual void abort() {
*static_cast<void**>(0) = 0;
::abort();
}

8
src/powerpc.cpp
View File

@ -2393,12 +2393,12 @@ class MyAssembler: public Assembler {
return b;
}
virtual unsigned length() {
return c.code.length();
virtual void endEvent() {
// ignore
}
virtual unsigned scratchSize() {
return c.constantPoolCount * BytesPerWord;
virtual unsigned length() {
return c.code.length();
}
virtual void dispose() {

8
src/x86.cpp
View File

@ -3532,12 +3532,12 @@ class MyAssembler: public Assembler {
return b;
}
virtual unsigned length() {
return c.code.length();
virtual void endEvent() {
// ignore
}
virtual unsigned scratchSize() {
return 0;
virtual unsigned length() {
return c.code.length();
}
virtual void dispose() {

6
test/Arrays.java
View File

@ -54,5 +54,11 @@ public class Arrays {
p = false;
expect(array[1] == array[p ? 0 : 1]);
}
{ int[] array = new int[1024];
array[1023] = -1;
expect(array[1023] == -1);
expect(array[1022] == 0);
}
}
}