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

add extra type checks to Compiler::store

Browse Source
This commit is contained in:
Joshua Warner 2014-05-01 00:01:14 -06:00 committed by Joshua Warner
parent 8b1739dc0f
commit 0ee3eec478
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/codegen/compiler.cpp
View File

@ -2619,6 +2619,7 @@ class MyCompiler: public Compiler {
assert(&c, assert(&c,
srcType.flavor() != ir::Type::Float srcType.flavor() != ir::Type::Float
|| srcType.size() == static_cast<Value*>(src)->type.size()); || srcType.size() == static_cast<Value*>(src)->type.size());
assert(&c, dstType == static_cast<Value*>(dst)->type);
appendMove(&c, appendMove(&c,
lir::Move, lir::Move,
srcType.size(), srcType.size(),

20
src/compile.cpp
View File

@ -3746,7 +3746,7 @@ intrinsic(MyThread* t, Frame* frame, object target)
Compiler::Operand* address = popLongAddress(frame); Compiler::Operand* address = popLongAddress(frame);
frame->popObject(); frame->popObject();
frame->pushInt( frame->pushInt(
c->load(1, 1, c->memory(address, types.i4), TargetBytesPerWord)); c->load(1, 1, c->memory(address, types.i1), TargetBytesPerWord));
return true; return true;
} else if (MATCH(methodName(t, target), "putByte") } else if (MATCH(methodName(t, target), "putByte")
and MATCH(methodSpec(t, target), "(JB)V")) and MATCH(methodSpec(t, target), "(JB)V"))
@ -3754,7 +3754,7 @@ intrinsic(MyThread* t, Frame* frame, object target)
Compiler::Operand* value = frame->popInt(); Compiler::Operand* value = frame->popInt();
Compiler::Operand* address = popLongAddress(frame); Compiler::Operand* address = popLongAddress(frame);
frame->popObject(); frame->popObject();
c->store(types.address, value, types.i1, c->memory(address, types.i4)); c->store(types.address, value, types.i1, c->memory(address, types.i1));
return true; return true;
} else if ((MATCH(methodName(t, target), "getShort") } else if ((MATCH(methodName(t, target), "getShort")
and MATCH(methodSpec(t, target), "(J)S")) and MATCH(methodSpec(t, target), "(J)S"))
@ -3764,7 +3764,7 @@ intrinsic(MyThread* t, Frame* frame, object target)
Compiler::Operand* address = popLongAddress(frame); Compiler::Operand* address = popLongAddress(frame);
frame->popObject(); frame->popObject();
frame->pushInt( frame->pushInt(
c->load(2, 2, c->memory(address, types.i4), TargetBytesPerWord)); c->load(2, 2, c->memory(address, types.i2), TargetBytesPerWord));
return true; return true;
} else if ((MATCH(methodName(t, target), "putShort") } else if ((MATCH(methodName(t, target), "putShort")
and MATCH(methodSpec(t, target), "(JS)V")) and MATCH(methodSpec(t, target), "(JS)V"))
@ -3774,7 +3774,7 @@ intrinsic(MyThread* t, Frame* frame, object target)
Compiler::Operand* value = frame->popInt(); Compiler::Operand* value = frame->popInt();
Compiler::Operand* address = popLongAddress(frame); Compiler::Operand* address = popLongAddress(frame);
frame->popObject(); frame->popObject();
c->store(types.address, value, types.i2, c->memory(address, types.i4)); c->store(types.address, value, types.i2, c->memory(address, types.i2));
return true; return true;
} else if ((MATCH(methodName(t, target), "getInt") } else if ((MATCH(methodName(t, target), "getInt")
and MATCH(methodSpec(t, target), "(J)I")) and MATCH(methodSpec(t, target), "(J)I"))
@ -3814,8 +3814,8 @@ intrinsic(MyThread* t, Frame* frame, object target)
c->load(8, c->load(8,
8, 8,
c->memory(address, c->memory(address,
MATCH(methodName(t, target), "getLong") ? types.i4 MATCH(methodName(t, target), "getLong") ? types.i8
: types.f4), : types.f8),
8)); 8));
return true; return true;
} else if ((MATCH(methodName(t, target), "putLong") } else if ((MATCH(methodName(t, target), "putLong")
@ -5764,7 +5764,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
types.address, types.address,
value, value,
types.i1, types.i1,
c->memory(table, types.i4, targetFieldOffset(context, field))); c->memory(table, types.i1, targetFieldOffset(context, field)));
break; break;
case CharField: case CharField:
@ -5773,7 +5773,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
types.address, types.address,
value, value,
types.i2, types.i2,
c->memory(table, types.i4, targetFieldOffset(context, field))); c->memory(table, types.i2, targetFieldOffset(context, field)));
break; break;
case FloatField: case FloatField:
@ -5797,7 +5797,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
types.f8, types.f8,
value, value,
types.f8, types.f8,
c->memory(table, types.f4, targetFieldOffset(context, field))); c->memory(table, types.f8, targetFieldOffset(context, field)));
break; break;
case LongField: case LongField:
@ -5805,7 +5805,7 @@ compile(MyThread* t, Frame* initialFrame, unsigned initialIp,
types.i8, types.i8,
value, value,
types.i8, types.i8,
c->memory(table, types.i4, targetFieldOffset(context, field))); c->memory(table, types.i8, targetFieldOffset(context, field)));
break; break;
case ObjectField: case ObjectField: