Merge pull request #164 from asmblur/mips-asm-warnings-fixes

Fix some warnings.

Author: nicolasnoble

src/mips/openbios/boot/boot.s

@@ -95,7 +95,10 @@ _boot:
     sw    $t0, SBUS_DEV8_CTRL
 
     /* clearing out all registers */
+    .set push
+    .set noat
     move  $1, $0
+    .set pop
     move  $2, $0
     move  $3, $0
     move  $4, $0

src/mips/openbios/kernel/handlers.c

@@ -27,7 +27,7 @@ void A0Vector();
 void B0Vector();
 void C0Vector();
 
-__attribute__((section(".a0table"))) uint32_t A0table[0xc0] = {
+__attribute__((section(".a0table"))) void * A0table[0xc0] = {
     unimplemented, unimplemented, unimplemented, unimplemented, // 00
     unimplemented, unimplemented, unimplemented, unimplemented, // 04
     unimplemented, unimplemented, unimplemented, unimplemented, // 08
@@ -78,7 +78,7 @@ __attribute__((section(".a0table"))) uint32_t A0table[0xc0] = {
     unimplemented, unimplemented, unimplemented, unimplemented, // bc
 };
 
-uint32_t B0table[0x60] = {
+void *B0table[0x60] = {
     unimplemented, unimplemented, unimplemented, unimplemented, // 00
     unimplemented, unimplemented, unimplemented, unimplemented, // 04
     unimplemented, unimplemented, unimplemented, unimplemented, // 08
@@ -105,7 +105,7 @@ uint32_t B0table[0x60] = {
     unimplemented, unimplemented, unimplemented, unimplemented, // 5c
 };
 
-uint32_t C0table[0x20] = {
+void * C0table[0x20] = {
     unimplemented, unimplemented, unimplemented, unimplemented, // 00
     unimplemented, unimplemented, unimplemented, unimplemented, // 04
     unimplemented, unimplemented, unimplemented, unimplemented, // 08
@@ -116,11 +116,11 @@ uint32_t C0table[0x20] = {
     unimplemented, unimplemented, unimplemented, unimplemented, // 1c
 };
 
-static void installHandler(const uint32_t * src, uint32_t * dst) {
-    dst[0] = src[0];
-    dst[1] = src[1];
-    dst[2] = src[2];
-    dst[3] = src[3];
+static void installHandler(const void * src, void * dst) {
+    ((uint32_t *) dst)[0] = ((uint32_t *) src)[0];
+    ((uint32_t *) dst)[1] = ((uint32_t *) src)[1];
+    ((uint32_t *) dst)[2] = ((uint32_t *) src)[2];
+    ((uint32_t *) dst)[3] = ((uint32_t *) src)[3];
 }
 
 void installKernelHandlers() {

src/mips/openbios/kernel/vectors.s

@@ -17,6 +17,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.           *
  ***************************************************************************/
 
+    .set push
     .set noreorder
     .section .data, "ax", @progbits
     .align 2
@@ -25,7 +26,10 @@
 
 generalHandler:
     sw    $0, 0x100($0)
+    .set push
+    .set noat
     sw    $1, 0x104($0)
+    .set pop
     sw    $2, 0x108($0)
     sw    $3, 0x10c($0)
     sw    $4, 0x110($0)
@@ -92,7 +96,10 @@ generalHandler:
     nop
     mtc0  $t3, $13
     nop
+    .set push
+    .set noat
     lw    $1, 0x104($0)
+    .set pop
     lw    $2, 0x108($0)
     lw    $3, 0x10c($0)
     lw    $4, 0x110($0)
@@ -227,3 +234,5 @@ unimplemented:
     nop
     jr    $ra
     nop
+
+    .set pop