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

use ir::Type in place of Compiler::OperandType

Browse Source
This commit is contained in:
Joshua Warner
2014-04-30 21:54:52 -06:00
committed by Joshua Warner
parent d8914a9646
commit 704c05f818
4 changed files with 802 additions and 651 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/codegen/compiler.cpp
View File

@ -156,7 +156,7 @@ popRead(Context* c, Event* e UNUSED, Value* v)
if (valid(nextWord->reads)) {
deadWord(c, v);
} else {
deadWord(c, nextWord);
deadWord(c, nextWord);
}
}
@ -186,22 +186,6 @@ addBuddy(Value* original, Value* buddy)
}
}
lir::ValueType
valueType(Context* c, Compiler::OperandType type)
{
switch (type) {
case Compiler::ObjectType:
case Compiler::AddressType:
case Compiler::IntegerType:
case Compiler::VoidType:
return lir::ValueGeneral;
case Compiler::FloatType:
return lir::ValueFloat;
default:
abort(c);
}
}
void
move(Context* c, Value* value, Site* src, Site* dst);
@ -2121,6 +2105,8 @@ unsigned typeFootprint(Context* c, ir::Type type)
case ir::Type::Address:
case ir::Type::Half:
return 1;
case ir::Type::Void:
return 0;
default:
abort(c);
}
@ -2306,13 +2292,14 @@ class MyCompiler: public Compiler {
return p;
}
virtual Operand* constant(int64_t value, Compiler::OperandType type) {
virtual Operand* constant(int64_t value, ir::Type type)
{
return promiseConstant(resolvedPromise(&c, value), type);
}
virtual Operand* promiseConstant(Promise* value, Compiler::OperandType type) {
return compiler::value
(&c, valueType(&c, type), compiler::constantSite(&c, value));
virtual Operand* promiseConstant(Promise* value, ir::Type type)
{
return compiler::value(&c, type, compiler::constantSite(&c, value));
}
virtual Operand* address(Promise* address) {
@ -2320,12 +2307,12 @@ class MyCompiler: public Compiler {
}
virtual Operand* memory(Operand* base,
OperandType type,
ir::Type type,
int displacement = 0,
Operand* index = 0,
unsigned scale = 1)
{
Value* result = value(&c, valueType(&c, type));
Value* result = value(&c, type);
appendMemory(&c, static_cast<Value*>(base), displacement,
static_cast<Value*>(index), scale, result);
@ -2441,7 +2428,7 @@ class MyCompiler: public Compiler {
unsigned flags,
TraceHandler* traceHandler,
unsigned resultSize,
OperandType resultType,
ir::Type resultType,
unsigned argumentCount,
...)
{
@ -2479,7 +2466,7 @@ class MyCompiler: public Compiler {
(&c, RUNTIME_ARRAY_BODY(arguments)[i], argumentStack);
}
Value* result = value(&c, valueType(&c, resultType));
Value* result = value(&c, resultType);
appendCall(&c, static_cast<Value*>(address), flags, traceHandler, result,
resultSize, argumentStack, index, 0);
@ -2490,10 +2477,10 @@ class MyCompiler: public Compiler {
unsigned flags,
TraceHandler* traceHandler,
unsigned resultSize,
OperandType resultType,
ir::Type resultType,
unsigned argumentFootprint)
{
Value* result = value(&c, valueType(&c, resultType));
Value* result = value(&c, resultType);
appendCall(&c, static_cast<Value*>(address), flags, traceHandler, result,
resultSize, c.stack, 0, argumentFootprint);
return result;