OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add check to catch bug underlying issue #152. Fix will take longer.

Browse Source
This commit is contained in:
Graydon Hoare 2010-08-26 14:32:47 -07:00
parent c3c3e03649
commit ee04c0236c
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/boot/be/ra.ml
View File

@ -563,7 +563,20 @@ let reg_alloc
let clobbers = cx.ctxt_abi.Abi.abi_clobbers quad in
let used = quad_used_vregs quad in
let defined = quad_defined_vregs quad in
let vreg_constrs v = (v, Bits.to_list (vreg_constraints.(v))) in
let used_constrs = List.map vreg_constrs used in
let constrs_collide (v1,c1) =
if List.length c1 <> 1
then false
else
List.exists
(fun (v2,c2) -> if v1 = v2 then false else c1 = c2)
used_constrs
in
begin
if List.exists constrs_collide used_constrs
then raise (Ra_error ("over-constrained vregs"));
if List.exists (fun def -> List.mem def clobbers) defined
then raise (Ra_error ("clobber and defined sets overlap"));
iflog cx
@ -629,7 +642,7 @@ let reg_alloc
with
Ra_error s ->
Session.fail sess "RA Error: %s" s;
Session.fail sess "RA error: %s\n" s;
(quads, 0)
;;