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

implement shl; fix thinko in Frame::Protector; fix uninitialized value warnings

Browse Source
This commit is contained in:
Joel Dice 2007-12-17 15:38:59 -07:00
parent 4c3a2575ba
commit 5c807a4ddc
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/compile.cpp
View File

@ -274,7 +274,7 @@ class Frame {
virtual void visit(Heap::Visitor* v) { virtual void visit(Heap::Visitor* v) {
v->visit(&(frame->method)); v->visit(&(frame->method));
if (next == 0) { if (frame->next == 0) {
Vector* pool = frame->objectPool; Vector* pool = frame->objectPool;
for (unsigned i = 0; i < pool->length(); i += sizeof(PoolElement)) { for (unsigned i = 0; i < pool->length(); i += sizeof(PoolElement)) {
v->visit(&(pool->peek<PoolElement>(i)->value)); v->visit(&(pool->peek<PoolElement>(i)->value));
@ -283,7 +283,7 @@ class Frame {
Vector* log = frame->traceLog; Vector* log = frame->traceLog;
unsigned traceSize = traceSizeInBytes(t, frame->method); unsigned traceSize = traceSizeInBytes(t, frame->method);
for (unsigned i = 0; i < log->length(); i += traceSize) { for (unsigned i = 0; i < log->length(); i += traceSize) {
v->visit(&(pool->peek<TraceElement>(i)->target)); v->visit(&(log->peek<TraceElement>(i)->target));
} }
} }
} }
@ -364,7 +364,7 @@ class Frame {
} }
static unsigned traceSizeInBytes(Thread* t, object method) { static unsigned traceSizeInBytes(Thread* t, object method) {
return sizeof(TraceElement) + mapSizeInWords(t, method); return sizeof(TraceElement) + mapSizeInBytes(t, method);
} }
void pushedInt() { void pushedInt() {
@ -1774,6 +1774,8 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip)
Operand* table; Operand* table;
if (instruction == getstatic) { if (instruction == getstatic) {
PROTECT(t, field);
initClass(t, fieldClass(t, field)); initClass(t, fieldClass(t, field));
if (UNLIKELY(t->exception)) return; if (UNLIKELY(t->exception)) return;
@ -2689,10 +2691,11 @@ compile(MyThread* t, Frame* initialFrame, unsigned ip)
object field = resolveField(t, codePool(t, code), index - 1); object field = resolveField(t, codePool(t, code), index - 1);
if (UNLIKELY(t->exception)) return; if (UNLIKELY(t->exception)) return;
object staticTable; object staticTable = 0;
if (instruction == putstatic) { if (instruction == putstatic) {
PROTECT(t, field); PROTECT(t, field);
initClass(t, fieldClass(t, field)); initClass(t, fieldClass(t, field));
if (UNLIKELY(t->exception)) return; if (UNLIKELY(t->exception)) return;
@ -3218,7 +3221,7 @@ invokeNative(MyThread* t)
{ {
object node = findTraceNode(t, *static_cast<void**>(t->stack)); object node = findTraceNode(t, *static_cast<void**>(t->stack));
object target = resolveTarget(t, t->stack, traceNodeTarget(t, node)); object target = resolveTarget(t, t->stack, traceNodeTarget(t, node));
uint64_t result; uint64_t result = 0;
if (LIKELY(t->exception == 0)) { if (LIKELY(t->exception == 0)) {
result = invokeNative2(t, target); result = invokeNative2(t, target);

7
src/compiler.cpp
View File

@ -1599,6 +1599,13 @@ MemoryOperand::accept(Context* c, Operation operation,
dx->release(c); dx->release(c);
} break; } break;
case shl: {
RegisterOperand* cx = temporary(c, rcx);
cx->accept(c, mov, operand);
encode(c, 0xd3, 4, this, true);
cx->release(c);
} break;
case sub: { case sub: {
encode(c, 0x29, operand->value, this, true); encode(c, 0x29, operand->value, this, true);
} break; } break;