aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Schmidt <github@mschmidt.me>2015-12-15 10:47:00 +0100
committerMichael Schmidt <github@mschmidt.me>2015-12-15 10:47:00 +0100
commitccb5562d254b3a82cc0b09b35126aac05edcc1aa (patch)
treebfb3acba4497a9e851cb14747721a835aedfc385
parent00e3b7b59515c086fb92751c15d61b0352f9fde9 (diff)
downloadcompcert-kvx-ccb5562d254b3a82cc0b09b35126aac05edcc1aa.tar.gz
compcert-kvx-ccb5562d254b3a82cc0b09b35126aac05edcc1aa.zip
bug 17752, rename builtin64_X to __builtin_X64
-rw-r--r--powerpc/Asmexpand.ml12
-rw-r--r--powerpc/CBuiltins.ml4
2 files changed, 8 insertions, 8 deletions
diff --git a/powerpc/Asmexpand.ml b/powerpc/Asmexpand.ml
index ee9dcccb..b50065f7 100644
--- a/powerpc/Asmexpand.ml
+++ b/powerpc/Asmexpand.ml
@@ -506,19 +506,19 @@ let expand_builtin_inline name args res =
| "__builtin_set_spr", _, _ ->
raise (Error "the first argument of __builtin_set_spr must be a constant")
(* Special registers in 32bit hybrid mode *)
- | "__builtin64_get_spr", [BA_int n], BR_splitlong(BR(IR rh), BR(IR rl)) ->
+ | "__builtin_get_spr64", [BA_int n], BR_splitlong(BR(IR rh), BR(IR rl)) ->
emit (Pmfspr(rl, n));
emit (Prldicl(rh, rl, _32, _32));
emit (Prldicl(rl, rl, _0, _32))
- | "__builtin64_get_spr", _, _ ->
- raise (Error "the argument of __builtin64_get_spr must be a constant")
- | "__builtin64_set_spr", [BA_int n; BA_splitlong(BA(IR ah), BA(IR al))], _ ->
+ | "__builtin_get_spr64", _, _ ->
+ raise (Error "the argument of __builtin_get_spr64 must be a constant")
+ | "__builtin_set_spr64", [BA_int n; BA_splitlong(BA(IR ah), BA(IR al))], _ ->
emit (Prldicr(GPR10, ah, _32, _31));
emit (Prldicl(al, al, _0, _32));
emit (Pori(GPR10, al, Cint _0));
emit (Pmtspr(n, GPR10))
- | "__builtin64_set_spr", _, _ ->
- raise (Error "the first argument of __builtin64_set_spr must be a constant")
+ | "__builtin_set_spr64", _, _ ->
+ raise (Error "the first argument of __builtin_set_spr64 must be a constant")
(* Move registers *)
| "__builtin_mr", [BA_int dst; BA_int src], _ ->
(match int_to_int_reg (Z.to_int dst), int_to_int_reg (Z.to_int src) with
diff --git a/powerpc/CBuiltins.ml b/powerpc/CBuiltins.ml
index 1e7c9a1d..ec3a633b 100644
--- a/powerpc/CBuiltins.ml
+++ b/powerpc/CBuiltins.ml
@@ -116,9 +116,9 @@ let builtins = {
"__builtin_set_spr",
(TVoid [], [TInt(IInt, []); TInt(IUInt, [])], false);
(* Access to special registers in 32bit hybrid mode*)
- "__builtin64_get_spr",
+ "__builtin_get_spr64",
(TInt(IULongLong, []), [TInt(IInt, [])], false);
- "__builtin64_set_spr",
+ "__builtin_set_spr64",
(TVoid [], [TInt(IInt, []); TInt(IULongLong, [])], false);
(* Move register *)
"__builtin_mr",