ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-03 09:41:10 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix a couple of bugs handling multi-word values

Browse Source
This commit is contained in:
Joel Dice 2009-01-12 09:26:43 -07:00
parent 582e975a8a
commit 034444db57
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/compiler.cpp
View File

@ -16,13 +16,13 @@ using namespace vm;
namespace { namespace {
const bool DebugAppend = false; const bool DebugAppend = false;
const bool DebugCompile = false; const bool DebugCompile = true;
const bool DebugResources = false; const bool DebugResources = true;
const bool DebugFrame = false; const bool DebugFrame = false;
const bool DebugControl = false; const bool DebugControl = true;
const bool DebugReads = false; const bool DebugReads = false;
const bool DebugSites = false; const bool DebugSites = false;
const bool DebugMoves = false; const bool DebugMoves = true;
const bool DebugBuddies = false; const bool DebugBuddies = false;
const int AnyFrameIndex = -2; const int AnyFrameIndex = -2;
@ -1032,7 +1032,7 @@ FrameResource::thaw(Context* c, Value* v)
class Target { class Target {
public: public:
static const int FrameIndex = -2; static const int FrameIndex = -2;
static const unsigned Impossible = 5; static const unsigned Impossible = 6;
Target(): cost(Impossible) { } Target(): cost(Impossible) { }
@ -1503,7 +1503,8 @@ registerSite(Context* c, int low, int high = NoRegister)
mask = ((~static_cast<uint64_t>(1)) << 32) | (1 << low); mask = ((~static_cast<uint64_t>(1)) << 32) | (1 << low);
} else { } else {
hr = c->registerResources + high; hr = c->registerResources + high;
mask = (1 << (high + 32)) | (1 << low); mask = (static_cast<uint64_t>(1) << (high + 32))
| (static_cast<uint64_t>(1) << low);
} }
return new (c->zone->allocate(sizeof(RegisterSite))) return new (c->zone->allocate(sizeof(RegisterSite)))
RegisterSite(mask, c->registerResources + low, hr); RegisterSite(mask, c->registerResources + low, hr);
@ -1807,12 +1808,12 @@ steal(Context* c, Resource* r, Value* thief, Stack* stack, Local* locals)
if (not ((thief and buddies(thief, r->value)) if (not ((thief and buddies(thief, r->value))
or hasMoreThanOneSite(r->value))) or hasMoreThanOneSite(r->value)))
{ {
r->freeze(c, r->value); r->site->freeze(c, r->value, r->size);
move(c, stack, locals, r->size, r->value, r->site, move(c, stack, locals, r->size, r->value, r->site,
pickTargetSite(c, live(r->value))); pickTargetSite(c, live(r->value)));
r->thaw(c, r->value); r->site->thaw(c, r->value, r->size);
} }
removeSite(c, r->value, r->site); removeSite(c, r->value, r->site);