diff options
author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-21 19:13:07 +0200 |
---|---|---|
committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-21 19:13:07 +0200 |
commit | 4b9b0e8f988cdfa1f848919b41bfe24c6e9a052a (patch) | |
tree | 0068ca2f3c45ffb7e07db62d681ccd3b96bcb167 /powerpc/Machregs.v | |
parent | a34b64ee2e7a535ebc0fc731243ab520c4ba430f (diff) | |
parent | 9147350fdb47f3471ce6d9202b7c996f79ffab2d (diff) | |
download | compcert-4b9b0e8f988cdfa1f848919b41bfe24c6e9a052a.tar.gz compcert-4b9b0e8f988cdfa1f848919b41bfe24c6e9a052a.zip |
Merge branch 'debugscopes' into debug_locations
Conflicts:
debug/CtoDwarf.ml
debug/DwarfPrinter.ml
Diffstat (limited to 'powerpc/Machregs.v')
-rw-r--r-- | powerpc/Machregs.v | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/powerpc/Machregs.v b/powerpc/Machregs.v index 402f07d1..a2017dca 100644 --- a/powerpc/Machregs.v +++ b/powerpc/Machregs.v @@ -217,9 +217,9 @@ Definition builtin_constraints (ef: external_function) : | EF_builtin id sg => if ident_eq id builtin_get_spr then OK_const :: nil else if ident_eq id builtin_set_spr then OK_const :: OK_default :: nil - else if ident_eq id builtin_prefetch then OK_addrany :: OK_const :: OK_const :: nil - else if ident_eq id builtin_dcbtls then OK_addrany::OK_const::nil - else if ident_eq id builtin_icbtls then OK_addrany::OK_const::nil + else if ident_eq id builtin_prefetch then OK_default :: OK_const :: OK_const :: nil + else if ident_eq id builtin_dcbtls then OK_default::OK_const::nil + else if ident_eq id builtin_icbtls then OK_default::OK_const::nil else if ident_eq id builtin_mbar then OK_const::nil else nil | EF_vload _ => OK_addrany :: nil |