d0p1/ack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reenable eviction of corrupted registers, which had been broken by a previous

Browse source 
change. Change the register move code to get swaps right, or at least righter.
This commit is contained in:
David Given 2016-11-15 21:55:10 +01:00
parent 86c832ef86
commit 581fa4a457
1 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
mach/proto/mcg/pass_registerallocator.c
View file

@ -347,13 +347,11 @@ static void add_through_register(struct vreg* vreg, struct hreg* hreg)
if (hreg) if (hreg)
{ {
bool unusedin = allocatable_stackable_input(hreg, vreg); bool unused = allocatable_through(hreg, vreg);
bool unusedout = allocatable_stackable_output(hreg, vreg);
struct vreg* inuse = pmap_findleft(current_ins, hreg); struct vreg* inuse = pmap_findleft(current_ins, hreg);
struct vreg* outuse = pmap_findleft(current_outs, hreg); struct vreg* outuse = pmap_findleft(current_outs, hreg);
if ((unusedin || (inuse == vreg)) && if (unused || ((inuse == vreg) && (outuse == vreg)))
(unusedout || (outuse == vreg)))
{ {
/* Input and output are either free or already assigned to this /* Input and output are either free or already assigned to this
* vreg. */ * vreg. */
@ -594,15 +592,14 @@ static int insert_moves(struct basicblock* bb, int index,
struct hreg* src = pmap_findright(srcregs, vreg); struct hreg* src = pmap_findright(srcregs, vreg);
assert(src != NULL); assert(src != NULL);
if (src != dest) pmap_add(&copies, src, dest);
pmap_add(&copies, src, dest);
} }
while (copies.count > 0) while (copies.count > 0)
{ {
struct hreg* src; struct hreg* src;
struct hreg* dest; struct hreg* dest;
struct hreg* temp; struct hreg* other;
struct hop* hop; struct hop* hop;
/* Try and find a destination which isn't a source. */ /* Try and find a destination which isn't a source. */
@ -627,14 +624,38 @@ static int insert_moves(struct basicblock* bb, int index,
} }
else else
{ {
/* There's nowhere to copy to --- the copies that are left form a cycle. /* Okay, so there's nowhere to free to move src to. This could be
* So we need to swap instead. */ * because it's already in the right place. */
src = copies.item[0].left; src = copies.item[0].left;
dest = pmap_findleft(&copies, src); dest = pmap_findleft(&copies, src);
hop = platform_swap(bb, src, dest);
pmap_remove(&copies, src, dest); if (src == dest)
pmap_remove(&copies, dest, src); {
/* This register is already in the right place! */
pmap_remove(&copies, src, dest);
continue;
}
else
{
/* It's not in the right place. That means we have a cycle, and need to do
* a swap. */
/* (src->dest, other->src) */
hop = platform_swap(bb, src, dest);
pmap_remove(&copies, src, dest);
/* Now src and dest are swapped. We know that the old src is in the right place
* and now contains dest. Any copies from the old dest (now containing src) must
* be patched to point at the old src. */
for (i=0; i<copies.count; i++)
{
if (copies.item[i].right == src)
copies.item[i].right = dest;
}
}
} }
array_insert(&bb->hops, hop, index + inserted); array_insert(&bb->hops, hop, index + inserted);