From 92eaac07118a620c2c9dd48921eefcb7ca4422a8 Mon Sep 17 00:00:00 2001
From: Andreas Hansson <andreas.hansson@arm.com>
Date: Mon, 2 Jul 2012 08:21:53 -0400
Subject: [PATCH] gcc: Fix warnings for gcc 4.7 and clang 3.1

This patch fixes two warnings, one related to a narrowing conversion
(int to MachInst), and one due to the cast operator for arguments and
a mismatch in const-ness (const void* and void*).
---
 src/arch/sparc/handlers.hh | 256 ++++++++++++++++++-------------------
 src/kern/tru64/printf.cc   |   2 +-
 2 files changed, 129 insertions(+), 129 deletions(-)

diff --git a/src/arch/sparc/handlers.hh b/src/arch/sparc/handlers.hh
index 3c5b31caf..274367cd3 100644
--- a/src/arch/sparc/handlers.hh
+++ b/src/arch/sparc/handlers.hh
@@ -44,146 +44,146 @@ const int numSpillInsts = 32;
 
 const MachInst fillHandler64[numFillInsts] =
 {
-    htog(0x87802016), // wr %g0, ASI_AIUP, %asi
-    htog(0xe0dba7ff), // ldxa [%sp + BIAS + (0*8)] %asi, %l0
-    htog(0xe2dba807), // ldxa [%sp + BIAS + (1*8)] %asi, %l1
-    htog(0xe4dba80f), // ldxa [%sp + BIAS + (2*8)] %asi, %l2
-    htog(0xe6dba817), // ldxa [%sp + BIAS + (3*8)] %asi, %l3
-    htog(0xe8dba81f), // ldxa [%sp + BIAS + (4*8)] %asi, %l4
-    htog(0xeadba827), // ldxa [%sp + BIAS + (5*8)] %asi, %l5
-    htog(0xecdba82f), // ldxa [%sp + BIAS + (6*8)] %asi, %l6
-    htog(0xeedba837), // ldxa [%sp + BIAS + (7*8)] %asi, %l7
-    htog(0xf0dba83f), // ldxa [%sp + BIAS + (8*8)] %asi, %i0
-    htog(0xf2dba847), // ldxa [%sp + BIAS + (9*8)] %asi, %i1
-    htog(0xf4dba84f), // ldxa [%sp + BIAS + (10*8)] %asi, %i2
-    htog(0xf6dba857), // ldxa [%sp + BIAS + (11*8)] %asi, %i3
-    htog(0xf8dba85f), // ldxa [%sp + BIAS + (12*8)] %asi, %i4
-    htog(0xfadba867), // ldxa [%sp + BIAS + (13*8)] %asi, %i5
-    htog(0xfcdba86f), // ldxa [%sp + BIAS + (14*8)] %asi, %i6
-    htog(0xfedba877), // ldxa [%sp + BIAS + (15*8)] %asi, %i7
-    htog(0x83880000), // restored
-    htog(0x83F00000), // retry
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000)  // illtrap
+    htog<MachInst>(0x87802016), // wr %g0, ASI_AIUP, %asi
+    htog<MachInst>(0xe0dba7ff), // ldxa [%sp + BIAS + (0*8)] %asi, %l0
+    htog<MachInst>(0xe2dba807), // ldxa [%sp + BIAS + (1*8)] %asi, %l1
+    htog<MachInst>(0xe4dba80f), // ldxa [%sp + BIAS + (2*8)] %asi, %l2
+    htog<MachInst>(0xe6dba817), // ldxa [%sp + BIAS + (3*8)] %asi, %l3
+    htog<MachInst>(0xe8dba81f), // ldxa [%sp + BIAS + (4*8)] %asi, %l4
+    htog<MachInst>(0xeadba827), // ldxa [%sp + BIAS + (5*8)] %asi, %l5
+    htog<MachInst>(0xecdba82f), // ldxa [%sp + BIAS + (6*8)] %asi, %l6
+    htog<MachInst>(0xeedba837), // ldxa [%sp + BIAS + (7*8)] %asi, %l7
+    htog<MachInst>(0xf0dba83f), // ldxa [%sp + BIAS + (8*8)] %asi, %i0
+    htog<MachInst>(0xf2dba847), // ldxa [%sp + BIAS + (9*8)] %asi, %i1
+    htog<MachInst>(0xf4dba84f), // ldxa [%sp + BIAS + (10*8)] %asi, %i2
+    htog<MachInst>(0xf6dba857), // ldxa [%sp + BIAS + (11*8)] %asi, %i3
+    htog<MachInst>(0xf8dba85f), // ldxa [%sp + BIAS + (12*8)] %asi, %i4
+    htog<MachInst>(0xfadba867), // ldxa [%sp + BIAS + (13*8)] %asi, %i5
+    htog<MachInst>(0xfcdba86f), // ldxa [%sp + BIAS + (14*8)] %asi, %i6
+    htog<MachInst>(0xfedba877), // ldxa [%sp + BIAS + (15*8)] %asi, %i7
+    htog<MachInst>(0x83880000), // restored
+    htog<MachInst>(0x83F00000), // retry
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000)  // illtrap
 };
 
 const MachInst fillHandler32[numFillInsts] =
 {
-    htog(0x87802016), // wr %g0, ASI_AIUP, %asi
-    htog(0xe083a000), // lduwa [%sp + (0*4)] %asi, %l0
-    htog(0xe283a004), // lduwa [%sp + (1*4)] %asi, %l1
-    htog(0xe483a008), // lduwa [%sp + (2*4)] %asi, %l2
-    htog(0xe683a00c), // lduwa [%sp + (3*4)] %asi, %l3
-    htog(0xe883a010), // lduwa [%sp + (4*4)] %asi, %l4
-    htog(0xea83a014), // lduwa [%sp + (5*4)] %asi, %l5
-    htog(0xec83a018), // lduwa [%sp + (6*4)] %asi, %l6
-    htog(0xee83a01c), // lduwa [%sp + (7*4)] %asi, %l7
-    htog(0xf083a020), // lduwa [%sp + (8*4)] %asi, %i0
-    htog(0xf283a024), // lduwa [%sp + (9*4)] %asi, %i1
-    htog(0xf483a028), // lduwa [%sp + (10*4)] %asi, %i2
-    htog(0xf683a02c), // lduwa [%sp + (11*4)] %asi, %i3
-    htog(0xf883a030), // lduwa [%sp + (12*4)] %asi, %i4
-    htog(0xfa83a034), // lduwa [%sp + (13*4)] %asi, %i5
-    htog(0xfc83a038), // lduwa [%sp + (14*4)] %asi, %i6
-    htog(0xfe83a03c), // lduwa [%sp + (15*4)] %asi, %i7
-    htog(0x83880000), // restored
-    htog(0x83F00000), // retry
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000)  // illtrap
+    htog<MachInst>(0x87802016), // wr %g0, ASI_AIUP, %asi
+    htog<MachInst>(0xe083a000), // lduwa [%sp + (0*4)] %asi, %l0
+    htog<MachInst>(0xe283a004), // lduwa [%sp + (1*4)] %asi, %l1
+    htog<MachInst>(0xe483a008), // lduwa [%sp + (2*4)] %asi, %l2
+    htog<MachInst>(0xe683a00c), // lduwa [%sp + (3*4)] %asi, %l3
+    htog<MachInst>(0xe883a010), // lduwa [%sp + (4*4)] %asi, %l4
+    htog<MachInst>(0xea83a014), // lduwa [%sp + (5*4)] %asi, %l5
+    htog<MachInst>(0xec83a018), // lduwa [%sp + (6*4)] %asi, %l6
+    htog<MachInst>(0xee83a01c), // lduwa [%sp + (7*4)] %asi, %l7
+    htog<MachInst>(0xf083a020), // lduwa [%sp + (8*4)] %asi, %i0
+    htog<MachInst>(0xf283a024), // lduwa [%sp + (9*4)] %asi, %i1
+    htog<MachInst>(0xf483a028), // lduwa [%sp + (10*4)] %asi, %i2
+    htog<MachInst>(0xf683a02c), // lduwa [%sp + (11*4)] %asi, %i3
+    htog<MachInst>(0xf883a030), // lduwa [%sp + (12*4)] %asi, %i4
+    htog<MachInst>(0xfa83a034), // lduwa [%sp + (13*4)] %asi, %i5
+    htog<MachInst>(0xfc83a038), // lduwa [%sp + (14*4)] %asi, %i6
+    htog<MachInst>(0xfe83a03c), // lduwa [%sp + (15*4)] %asi, %i7
+    htog<MachInst>(0x83880000), // restored
+    htog<MachInst>(0x83F00000), // retry
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000)  // illtrap
 };
 
 const MachInst spillHandler64[numSpillInsts] =
 {
-    htog(0x87802016), // wr %g0, ASI_AIUP, %asi
-    htog(0xe0f3a7ff), // stxa %l0, [%sp + BIAS + (0*8)] %asi
-    htog(0xe2f3a807), // stxa %l1, [%sp + BIAS + (1*8)] %asi
-    htog(0xe4f3a80f), // stxa %l2, [%sp + BIAS + (2*8)] %asi
-    htog(0xe6f3a817), // stxa %l3, [%sp + BIAS + (3*8)] %asi
-    htog(0xe8f3a81f), // stxa %l4, [%sp + BIAS + (4*8)] %asi
-    htog(0xeaf3a827), // stxa %l5, [%sp + BIAS + (5*8)] %asi
-    htog(0xecf3a82f), // stxa %l6, [%sp + BIAS + (6*8)] %asi
-    htog(0xeef3a837), // stxa %l7, [%sp + BIAS + (7*8)] %asi
-    htog(0xf0f3a83f), // stxa %i0, [%sp + BIAS + (8*8)] %asi
-    htog(0xf2f3a847), // stxa %i1, [%sp + BIAS + (9*8)] %asi
-    htog(0xf4f3a84f), // stxa %i2, [%sp + BIAS + (10*8)] %asi
-    htog(0xf6f3a857), // stxa %i3, [%sp + BIAS + (11*8)] %asi
-    htog(0xf8f3a85f), // stxa %i4, [%sp + BIAS + (12*8)] %asi
-    htog(0xfaf3a867), // stxa %i5, [%sp + BIAS + (13*8)] %asi
-    htog(0xfcf3a86f), // stxa %i6, [%sp + BIAS + (14*8)] %asi
-    htog(0xfef3a877), // stxa %i7, [%sp + BIAS + (15*8)] %asi
-    htog(0x81880000), // saved
-    htog(0x83F00000), // retry
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000)  // illtrap
+    htog<MachInst>(0x87802016), // wr %g0, ASI_AIUP, %asi
+    htog<MachInst>(0xe0f3a7ff), // stxa %l0, [%sp + BIAS + (0*8)] %asi
+    htog<MachInst>(0xe2f3a807), // stxa %l1, [%sp + BIAS + (1*8)] %asi
+    htog<MachInst>(0xe4f3a80f), // stxa %l2, [%sp + BIAS + (2*8)] %asi
+    htog<MachInst>(0xe6f3a817), // stxa %l3, [%sp + BIAS + (3*8)] %asi
+    htog<MachInst>(0xe8f3a81f), // stxa %l4, [%sp + BIAS + (4*8)] %asi
+    htog<MachInst>(0xeaf3a827), // stxa %l5, [%sp + BIAS + (5*8)] %asi
+    htog<MachInst>(0xecf3a82f), // stxa %l6, [%sp + BIAS + (6*8)] %asi
+    htog<MachInst>(0xeef3a837), // stxa %l7, [%sp + BIAS + (7*8)] %asi
+    htog<MachInst>(0xf0f3a83f), // stxa %i0, [%sp + BIAS + (8*8)] %asi
+    htog<MachInst>(0xf2f3a847), // stxa %i1, [%sp + BIAS + (9*8)] %asi
+    htog<MachInst>(0xf4f3a84f), // stxa %i2, [%sp + BIAS + (10*8)] %asi
+    htog<MachInst>(0xf6f3a857), // stxa %i3, [%sp + BIAS + (11*8)] %asi
+    htog<MachInst>(0xf8f3a85f), // stxa %i4, [%sp + BIAS + (12*8)] %asi
+    htog<MachInst>(0xfaf3a867), // stxa %i5, [%sp + BIAS + (13*8)] %asi
+    htog<MachInst>(0xfcf3a86f), // stxa %i6, [%sp + BIAS + (14*8)] %asi
+    htog<MachInst>(0xfef3a877), // stxa %i7, [%sp + BIAS + (15*8)] %asi
+    htog<MachInst>(0x81880000), // saved
+    htog<MachInst>(0x83F00000), // retry
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000)  // illtrap
 };
 
 const MachInst spillHandler32[numSpillInsts] =
 {
-    htog(0x87802016), // wr %g0, ASI_AIUP, %asi
-    htog(0xe0a3a000), // stwa %l0, [%sp + (0*4)] %asi
-    htog(0xe2a3a004), // stwa %l1, [%sp + (1*4)] %asi
-    htog(0xe4a3a008), // stwa %l2, [%sp + (2*4)] %asi
-    htog(0xe6a3a00c), // stwa %l3, [%sp + (3*4)] %asi
-    htog(0xe8a3a010), // stwa %l4, [%sp + (4*4)] %asi
-    htog(0xeaa3a014), // stwa %l5, [%sp + (5*4)] %asi
-    htog(0xeca3a018), // stwa %l6, [%sp + (6*4)] %asi
-    htog(0xeea3a01c), // stwa %l7, [%sp + (7*4)] %asi
-    htog(0xf0a3a020), // stwa %i0, [%sp + (8*4)] %asi
-    htog(0xf2a3a024), // stwa %i1, [%sp + (9*4)] %asi
-    htog(0xf4a3a028), // stwa %i2, [%sp + (10*4)] %asi
-    htog(0xf6a3a02c), // stwa %i3, [%sp + (11*4)] %asi
-    htog(0xf8a3a030), // stwa %i4, [%sp + (12*4)] %asi
-    htog(0xfaa3a034), // stwa %i5, [%sp + (13*4)] %asi
-    htog(0xfca3a038), // stwa %i6, [%sp + (14*4)] %asi
-    htog(0xfea3a03c), // stwa %i7, [%sp + (15*4)] %asi
-    htog(0x81880000), // saved
-    htog(0x83F00000), // retry
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000), // illtrap
-    htog(0x00000000)  // illtrap
+    htog<MachInst>(0x87802016), // wr %g0, ASI_AIUP, %asi
+    htog<MachInst>(0xe0a3a000), // stwa %l0, [%sp + (0*4)] %asi
+    htog<MachInst>(0xe2a3a004), // stwa %l1, [%sp + (1*4)] %asi
+    htog<MachInst>(0xe4a3a008), // stwa %l2, [%sp + (2*4)] %asi
+    htog<MachInst>(0xe6a3a00c), // stwa %l3, [%sp + (3*4)] %asi
+    htog<MachInst>(0xe8a3a010), // stwa %l4, [%sp + (4*4)] %asi
+    htog<MachInst>(0xeaa3a014), // stwa %l5, [%sp + (5*4)] %asi
+    htog<MachInst>(0xeca3a018), // stwa %l6, [%sp + (6*4)] %asi
+    htog<MachInst>(0xeea3a01c), // stwa %l7, [%sp + (7*4)] %asi
+    htog<MachInst>(0xf0a3a020), // stwa %i0, [%sp + (8*4)] %asi
+    htog<MachInst>(0xf2a3a024), // stwa %i1, [%sp + (9*4)] %asi
+    htog<MachInst>(0xf4a3a028), // stwa %i2, [%sp + (10*4)] %asi
+    htog<MachInst>(0xf6a3a02c), // stwa %i3, [%sp + (11*4)] %asi
+    htog<MachInst>(0xf8a3a030), // stwa %i4, [%sp + (12*4)] %asi
+    htog<MachInst>(0xfaa3a034), // stwa %i5, [%sp + (13*4)] %asi
+    htog<MachInst>(0xfca3a038), // stwa %i6, [%sp + (14*4)] %asi
+    htog<MachInst>(0xfea3a03c), // stwa %i7, [%sp + (15*4)] %asi
+    htog<MachInst>(0x81880000), // saved
+    htog<MachInst>(0x83F00000), // retry
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000), // illtrap
+    htog<MachInst>(0x00000000)  // illtrap
 };
 
 } // namespace SparcISA
diff --git a/src/kern/tru64/printf.cc b/src/kern/tru64/printf.cc
index 600e96818..dfd300c12 100644
--- a/src/kern/tru64/printf.cc
+++ b/src/kern/tru64/printf.cc
@@ -177,7 +177,7 @@ Printf(Arguments args)
                   break;
 
                 case 's': {
-                    const char *s = (const char *)args;
+                    const char *s = (char *)args;
                     if (!s)
                         s = "<NULL>";
 
-- 
2.30.2