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

fix merge-related regression affecting bootimage build

Browse Source
This commit is contained in:
Joel Dice 2009-02-09 19:00:53 -07:00
parent 9b0d6854ec
commit e3257134c9
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/x86.cpp
View File

@ -976,12 +976,16 @@ moveCM(Context* c, unsigned aSize UNUSED, Assembler::Constant* a,
break;
case 8: {
if (BytesPerWord == 8
and a->value->resolved()
and isInt32(a->value->value()))
{
encode(c, 0xc7, 0, b, true);
c->code.append4(a->value->value());
if (BytesPerWord == 8) {
if(a->value->resolved() and isInt32(a->value->value())) {
encode(c, 0xc7, 0, b, true);
c->code.append4(a->value->value());
} else {
Assembler::Register tmp(c->client->acquireTemporary());
moveCR(c, 8, a, 8, &tmp);
moveRM(c, 8, &tmp, 8, b);
c->client->releaseTemporary(tmp.low);
}
} else {
Assembler::Constant ah(shiftMaskPromise(c, a->value, 32, 0xFFFFFFFF));
Assembler::Constant al(shiftMaskPromise(c, a->value, 0, 0xFFFFFFFF));