ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-01 16:58:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

remove redundant Compiler::stackCall resultSize parameter

Browse Source
This commit is contained in:
Joshua Warner 2014-04-30 23:54:25 -06:00 committed by Joshua Warner
parent 1d466a800e
commit 8b1739dc0f
3 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/avian/codegen/compiler.h
View File

@ -91,7 +91,6 @@ class Compiler {
virtual Operand* stackCall(Operand* address, virtual Operand* stackCall(Operand* address,
unsigned flags, unsigned flags,
TraceHandler* traceHandler, TraceHandler* traceHandler,
unsigned resultSize,
ir::Type resultType, ir::Type resultType,
unsigned argumentFootprint) = 0; unsigned argumentFootprint) = 0;

12
src/codegen/compiler.cpp
View File

@ -2497,13 +2497,19 @@ class MyCompiler: public Compiler {
virtual Operand* stackCall(Operand* address, virtual Operand* stackCall(Operand* address,
unsigned flags, unsigned flags,
TraceHandler* traceHandler, TraceHandler* traceHandler,
unsigned resultSize,
ir::Type resultType, ir::Type resultType,
unsigned argumentFootprint) unsigned argumentFootprint)
{ {
Value* result = value(&c, resultType); Value* result = value(&c, resultType);
appendCall(&c, static_cast<Value*>(address), flags, traceHandler, result, appendCall(&c,
resultSize, c.stack, 0, argumentFootprint); static_cast<Value*>(address),
flags,
traceHandler,
result,
resultType.size(),
c.stack,
0,
argumentFootprint);
return result; return result;
} }

28
src/compile.cpp
View File

@ -3162,9 +3162,12 @@ void compileSafePoint(MyThread* t, Compiler* c, Frame* frame) {
c->threadRegister()); c->threadRegister());
} }
Compiler::Operand* Compiler::Operand* compileDirectInvoke(MyThread* t,
compileDirectInvoke(MyThread* t, Frame* frame, object target, bool tailCall, Frame* frame,
bool useThunk, unsigned rSize, avian::codegen::Promise* addressPromise) object target,
bool tailCall,
bool useThunk,
avian::codegen::Promise* addressPromise)
{ {
avian::codegen::Compiler* c = frame->c; avian::codegen::Compiler* c = frame->c;
ir::Types types(TargetBytesPerWord); ir::Types types(TargetBytesPerWord);
@ -3199,7 +3202,6 @@ compileDirectInvoke(MyThread* t, Frame* frame, object target, bool tailCall,
c->promiseConstant(returnAddressPromise, types.address), c->promiseConstant(returnAddressPromise, types.address),
flags, flags,
trace, trace,
rSize,
operandTypeForFieldCode(t, methodReturnCode(t, target)), operandTypeForFieldCode(t, methodReturnCode(t, target)),
methodParameterFootprint(t, target)); methodParameterFootprint(t, target));
@ -3221,7 +3223,6 @@ compileDirectInvoke(MyThread* t, Frame* frame, object target, bool tailCall,
c->constant(defaultThunk(t), types.address), c->constant(defaultThunk(t), types.address),
flags, flags,
frame->trace(target, traceFlags), frame->trace(target, traceFlags),
rSize,
operandTypeForFieldCode(t, methodReturnCode(t, target)), operandTypeForFieldCode(t, methodReturnCode(t, target)),
methodParameterFootprint(t, target)); methodParameterFootprint(t, target));
} }
@ -3236,7 +3237,6 @@ compileDirectInvoke(MyThread* t, Frame* frame, object target, bool tailCall,
flags, flags,
tailCall ? 0 : frame->trace tailCall ? 0 : frame->trace
((methodFlags(t, target) & ACC_NATIVE) ? target : 0, 0), ((methodFlags(t, target) & ACC_NATIVE) ? target : 0, 0),
rSize,
operandTypeForFieldCode(t, methodReturnCode(t, target)), operandTypeForFieldCode(t, methodReturnCode(t, target)),
methodParameterFootprint(t, target)); methodParameterFootprint(t, target));
} }
@ -3269,20 +3269,16 @@ compileDirectInvoke(MyThread* t, Frame* frame, object target, bool tailCall)
object pointer = makePointer(t, p); object pointer = makePointer(t, p);
bc->calls = makeTriple(t, target, pointer, bc->calls); bc->calls = makeTriple(t, target, pointer, bc->calls);
result = compileDirectInvoke result = compileDirectInvoke(t, frame, target, tailCall, false, p);
(t, frame, target, tailCall, false, rSize, p);
} else { } else {
result = compileDirectInvoke result = compileDirectInvoke(t, frame, target, tailCall, true, 0);
(t, frame, target, tailCall, true, rSize, 0);
} }
} else if (unresolved(t, methodAddress(t, target)) } else if (unresolved(t, methodAddress(t, target))
or classNeedsInit(t, methodClass(t, target))) or classNeedsInit(t, methodClass(t, target)))
{ {
result = compileDirectInvoke result = compileDirectInvoke(t, frame, target, tailCall, true, 0);
(t, frame, target, tailCall, true, rSize, 0);
} else { } else {
result = compileDirectInvoke result = compileDirectInvoke(t, frame, target, tailCall, false, 0);
(t, frame, target, tailCall, false, rSize, 0);
} }
} }
@ -3332,7 +3328,6 @@ compileReferenceInvoke(MyThread* t, Frame* frame, Compiler::Operand* method,
(method, (method,
tailCall ? Compiler::TailJump : 0, tailCall ? Compiler::TailJump : 0,
frame->trace(0, 0), frame->trace(0, 0),
rSize,
operandTypeForFieldCode(t, returnCode), operandTypeForFieldCode(t, returnCode),
parameterFootprint); parameterFootprint);
@ -3383,7 +3378,6 @@ compileAbstractInvoke(MyThread* t, Frame* frame, Compiler::Operand* method,
(method, (method,
tailCall ? Compiler::TailJump : 0, tailCall ? Compiler::TailJump : 0,
frame->trace(0, 0), frame->trace(0, 0),
rSize,
operandTypeForFieldCode(t, returnCode), operandTypeForFieldCode(t, returnCode),
parameterFootprint); parameterFootprint);
@ -5055,7 +5049,6 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
c->peek(1, parameterFootprint - 1)), c->peek(1, parameterFootprint - 1)),
tailCall ? Compiler::TailJump : 0, tailCall ? Compiler::TailJump : 0,
frame->trace(0, 0), frame->trace(0, 0),
rSize,
operandTypeForFieldCode(t, returnCode), operandTypeForFieldCode(t, returnCode),
parameterFootprint); parameterFootprint);
@ -5164,7 +5157,6 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
offset), offset),
tailCall ? Compiler::TailJump : 0, tailCall ? Compiler::TailJump : 0,
frame->trace(0, 0), frame->trace(0, 0),
rSize,
operandTypeForFieldCode(t, methodReturnCode(t, target)), operandTypeForFieldCode(t, methodReturnCode(t, target)),
parameterFootprint); parameterFootprint);