From 71dc8ea1a856276406b8f9c70c923c0ed2df8908 Mon Sep 17 00:00:00 2001
From: Peter Molnar <pm@complang.tuwien.ac.at>
Date: Sat, 20 Oct 2007 19:19:06 +0000
Subject: [PATCH] * src/vm/jit/s390/codegen.c, src/vm/jit/s390/disass.c,
 src/vm/jit/s390/md.c: Fixed compile warnings.

---
 src/vm/jit/s390/codegen.c | 14 ++++++++++----
 src/vm/jit/s390/disass.c  |  5 +++--
 src/vm/jit/s390/md.c      |  7 ++++---
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/vm/jit/s390/codegen.c b/src/vm/jit/s390/codegen.c
index 2dd1bfe6c..5ff7c051c 100644
--- a/src/vm/jit/s390/codegen.c
+++ b/src/vm/jit/s390/codegen.c
@@ -76,9 +76,10 @@
  * purpose registers.
  */
 
+/*
 static void do__log(u4 *regs) {
-	/* insert stuff here */
 }
+*/
 
 #define DO__LOG \
 	N_AHI(REG_SP, -200); \
@@ -89,7 +90,11 @@ static void do__log(u4 *regs) {
 	N_LM(R0, R15, 96, REG_SP); \
 	N_AHI(REG_SP, 200);
 
-#define SUPPORT_HERCULES 1
+/* If the following macro is defined, workaround code for hercules quirks
+ * is generated
+ */
+
+/* #define SUPPORT_HERCULES 1 */
 
 /* codegen *********************************************************************
 
@@ -130,8 +135,7 @@ bool codegen_emit(jitdata *jd)
 	registerdata       *rd;
 	s4                  len, s1, s2, s3, d, dd, disp;
 	u2                  currentline;
-	ptrint              a;
-	varinfo            *var, *var1, *var2, *dst;
+	varinfo            *var;
 	basicblock         *bptr;
 	instruction        *iptr;
 	constant_classref  *cr;
@@ -1619,7 +1623,9 @@ bool codegen_emit(jitdata *jd)
 
 		case ICMD_F2D:       /* ..., value  ==> ..., (double) value           */
 			{
+#ifdef SUPPORT_HERCULES
 				u1 *ref;
+#endif
 				s1 = emit_load_s1(jd, iptr, REG_FTMP1);
 				d = codegen_reg_of_dst(jd, iptr, REG_FTMP2);
 #ifdef SUPPORT_HERCULES
diff --git a/src/vm/jit/s390/disass.c b/src/vm/jit/s390/disass.c
index 56a7df1de..cbda3c5f4 100644
--- a/src/vm/jit/s390/disass.c
+++ b/src/vm/jit/s390/disass.c
@@ -36,6 +36,7 @@
 
 #include <dis-asm.h>
 #include <stdio.h>
+#include <stdint.h>
 
 #include "vm/types.h"
 
@@ -83,7 +84,7 @@ static s4 disass_pseudo_instr(u1 *code) {
 	switch (code[0]) {
 		/* Trap */
 		case 0x02:
-			snprintf(disass_buf, 512, "ill\t0x%02hhx (pseudo)", code[1]);
+			snprintf(disass_buf, 512, "ill\t0x%02x (pseudo)", (int)code[1]);
 			return 2;
 		/* Not recognized */
 		default:
@@ -124,7 +125,7 @@ u1 *disassinstr(u1 *code)
 	seqlen = disass_pseudo_instr(code);
 
 	if (seqlen == 0) {
-		seqlen = print_insn_s390((bfd_vma) code, &info);
+		seqlen = print_insn_s390((bfd_vma)(intptr_t)code, &info);
 	}
 
 	for (i = 0; i < seqlen; i++, code++) {
diff --git a/src/vm/jit/s390/md.c b/src/vm/jit/s390/md.c
index 1d1ac447c..431b6e9e2 100644
--- a/src/vm/jit/s390/md.c
+++ b/src/vm/jit/s390/md.c
@@ -57,10 +57,11 @@
 #include "vm/jit/s390/codegen.h"
 
 #include <assert.h>
-#define OOPS() assert(0);
 
 /* prototypes *****************************************************************/
 
+u1 *exceptions_handle_exception(java_object_t *xptro, u1 *xpc, u1 *pv, u1 *sp);
+
 void md_signal_handler_sigill(int sig, siginfo_t *siginfo, void *_p);
 
 void md_dump_context(u1 *pc, mcontext_t *mc);
@@ -490,7 +491,7 @@ void *md_jit_method_patch_address(void* pv, void *ra, void *mptr)
 
 			/* add offset to method pointer */
 			
-			pa = mptr + offset;
+			pa = (uint8_t *)mptr + offset;
 			break;
 
 		default:
@@ -607,7 +608,7 @@ void md_handle_exception(int32_t *regs, int64_t *fregs, int32_t *out) {
 
 		pv = codegen_get_pv_from_pc(xpc);
 
-		handler = exceptions_handle_exception(xptr, xpc, pv, sp);
+		handler = exceptions_handle_exception((java_object_t *)xptr, xpc, pv, sp);
 
 		if (handler == NULL) {
 
-- 
2.25.1