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

Merge branch 'master' of git://github.com/ReadyTalk/avian

Browse Source 
Conflicts:
	src/codegen/arm/assembler.cpp
	src/common.h
	src/machine.cpp
This commit is contained in:
Joshua Warner
2013-02-12 17:37:19 -07:00
parent f7b49ddb06 3812d012a3
commit 3589d5c205
27 changed files with 1979 additions and 400 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/interpret.cpp
View File

@ -18,7 +18,7 @@
using namespace vm;
namespace {
namespace local {
const unsigned FrameBaseOffset = 0;
const unsigned FrameNextOffset = 1;
@ -647,7 +647,7 @@ invokeNative(Thread* t, object method)
{ THREAD_RESOURCE0(t, popFrame(static_cast<Thread*>(t)));
unsigned footprint = methodParameterFootprint(t, method);
RUNTIME_ARRAY(uintptr_t, args, footprint);
THREAD_RUNTIME_ARRAY(t, uintptr_t, args, footprint);
unsigned sp = frameBase(t, t->frame);
unsigned argOffset = 0;
if ((methodFlags(t, method) & ACC_STATIC) == 0) {
@ -2321,7 +2321,7 @@ interpret3(Thread* t, const int base)
object class_ = resolveClassInPool(t, frameMethod(t, frame), index - 1);
PROTECT(t, class_);
int32_t counts[dimensions];
THREAD_RUNTIME_ARRAY(t, int32_t, counts, dimensions);
for (int i = dimensions - 1; i >= 0; --i) {
counts[i] = popInt(t);
if (UNLIKELY(counts[i] < 0)) {
@ -3100,7 +3100,7 @@ class MyProcessor: public Processor {
(&byteArrayBody(t, methodSpec(t, method), 0));
pushArguments(t, this_, spec, arguments);
return ::invoke(t, method);
return local::invoke(t, method);
}
virtual object
@ -3124,7 +3124,7 @@ class MyProcessor: public Processor {
(&byteArrayBody(t, methodSpec(t, method), 0));
pushArguments(t, this_, spec, arguments);
return ::invoke(t, method);
return local::invoke(t, method);
}
virtual object
@ -3148,7 +3148,7 @@ class MyProcessor: public Processor {
(&byteArrayBody(t, methodSpec(t, method), 0));
pushArguments(t, this_, spec, indirectObjects, arguments);
return ::invoke(t, method);
return local::invoke(t, method);
}
virtual object
@ -3174,7 +3174,7 @@ class MyProcessor: public Processor {
assert(t, ((methodFlags(t, method) & ACC_STATIC) == 0) xor (this_ == 0));
return ::invoke(t, method);
return local::invoke(t, method);
}
virtual object getStackTrace(vm::Thread* t, vm::Thread*) {
@ -3254,8 +3254,8 @@ namespace vm {
Processor*
makeProcessor(System* system, Allocator* allocator, bool)
{
return new (allocator->allocate(sizeof(MyProcessor)))
MyProcessor(system, allocator);
return new (allocator->allocate(sizeof(local::MyProcessor)))
local::MyProcessor(system, allocator);
}
} // namespace vm