[kaffe] Enable --with-debug for ARM builds

Jukka Santala jsantala at tml.hut.fi
Fri Jun 7 05:12:46 PDT 2002


Here's a rather simplistic patch to get --with-debug configure parameter
to work with ARM JIT builds. Looking at the Kaffe CE source, it seems like
the _dbg_vm_jit_code variable is newer alternative, so possibly we should
be moving to using that instead, merging with PocketLinux. However, for
this case and 1.0.7 release just getting the debug output working seemed
like a more worthwhile goal to me. It seems like rather minor issue
anyhow, but maybe this patch should go to the 1.0.7 branch and a merge
towards PocketLinux/CE on the CVS head.

 -Jukka Santala
-------------- next part --------------
Index: config/arm/jit-arm.def
===================================================================
RCS file: /cvs/kaffe/kaffe/config/arm/jit-arm.def,v
retrieving revision 1.3
diff -u -r1.3 jit-arm.def
--- config/arm/jit-arm.def	17 Jun 2001 16:39:10 -0000	1.3
+++ config/arm/jit-arm.def	7 Jun 2002 11:55:01 -0000
@@ -10,10 +10,8 @@
  */
 
 #ifdef DEBUG
-extern char _dbg_vm_jit_translate;
-extern void kprintf(char *, ...);
-#define	debug(MSG)	 { if( _dbg_vm_jit_translate) { fprintf(stderr,"[%s:%d] 0x%x:\t", __FUNCTION__, __LINE__, CODEPC); fprintf MSG; } }
-#define DBOUT stderr
+int jit_debug;
+#define debug(x)        (jit_debug ? dprintf("%x:\t", CODEPC), dprintf x : 0)
 #else
 #define	debug(x)
 #endif
@@ -611,7 +609,7 @@
 	 */
 
 	op_push_prologue(SP,BPC|BFP|BIP|BLR|BR4|BR5|BR6|BR7|BR8|BR9|BR10);
-	debug((DBOUT,"maxStack = %d, maxLocal = %d, maxTemp = %d\n", maxStack, maxLocal, maxTemp));
+	debug(("maxStack = %d, maxLocal = %d, maxTemp = %d\n", maxStack, maxLocal, maxTemp));
 
 	/*
 	 * This effectively hides/removes the just-pushed
@@ -661,7 +659,7 @@
 
 	/* Should restore floating point state here !!! F4-F7 */
 
-	debug((DBOUT,"maxStack = %d, maxLocal = %d, maxTemp = %d\n", maxStack, maxLocal, maxTemp));
+	debug(("maxStack = %d, maxLocal = %d, maxTemp = %d\n", maxStack, maxLocal, maxTemp));
 	/*
 	 * Pushed as
 	 * FP	-> FP
@@ -682,7 +680,7 @@
 	assert(__I12const_rangecheck(o));
 	op_store_offset(r, FP, o);
 
-	debug((DBOUT,"spill_int %d, [FP, %d]\n", r, o));
+	debug(("spill_int %d, [FP, %d]\n", r, o));
 }
 
 define_insn(spill_float, fspill_Rxx)
@@ -694,7 +692,7 @@
 	assert( (o & 0x3) == 0);
 	op_fstore_offset(r, FP, o >> 2);
 
-	debug((DBOUT,"spill_float %d, [FP, %d]\n", r, o));
+	debug(("spill_float %d, [FP, %d]\n", r, o));
 }
 
 define_insn(spill_double, fspilll_Rxx)
@@ -706,7 +704,7 @@
 	assert( (o & 0x3) == 0);
 	op_fstorel_offset(r, FP, o >> 2);
 
-	debug((DBOUT,"spill_double %d, [FP, %d]\n", r, o));
+	debug(("spill_double %d, [FP, %d]\n", r, o));
 }
 
 define_insn(reload_int, reload_Rxx)
@@ -717,7 +715,7 @@
 	assert(__I12const_rangecheck(o));
 	op_load_offset(r, FP, o);
 
-	debug((DBOUT,"reload_int %d, [FP, %d]\n", r, o));
+	debug(("reload_int %d, [FP, %d]\n", r, o));
 }
 
 define_insn(reload_float, freload_Rxx)
@@ -729,7 +727,7 @@
 	assert( (o & 0x3) == 0);
 	op_fload_offset(r, FP, o >> 2);
 
-	debug((DBOUT,"reload_float %d, [FP, %d]\n", r, o));
+	debug(("reload_float %d, [FP, %d]\n", r, o));
 }
 
 define_insn(reload_double, freloadl_Rxx)
@@ -741,7 +739,7 @@
 	assert( (o & 0x3) == 0);
 	op_floadl_offset(r, FP, o >> 2);
 
-	debug((DBOUT,"reload_double %d, [FP, %d]\n", r, o));
+	debug(("reload_double %d, [FP, %d]\n", r, o));
 }
 
 /* --------------------------------------------------------------------- */
@@ -761,7 +759,7 @@
 		if ((sval & 0xFFFFFF00) == 0) {
 			op_mov_c(w, sval, (32 - shift) % 32);
 
-			debug((DBOUT,"move_int_const %d, %d (0x%x) via shift (%d, %d)\n", w, val, val, sval, shift));
+			debug(("move_int_const %d, %d (0x%x) via shift (%d, %d)\n", w, val, val, sval, shift));
 
 			return;
 		}
@@ -779,7 +777,7 @@
 	op_add_c(w, w, (val >> 16) & 0x000000FF, 16);
 	op_add_c(w, w, (val >> 24) & 0x000000FF, 8);
 
-	debug((DBOUT,"move_int_const %d, %d (0x%x)\n", w, val, val));
+	debug(("move_int_const %d, %d (0x%x)\n", w, val, val));
 }
 
 define_insn(move_label_const, move_RxL)
@@ -796,7 +794,7 @@
 	op_add_c(w, w, 0, 16);
 	op_add_c(w, w, 0, 8);
 
-	debug((DBOUT,"move_label_const %d, ?\n", w));
+	debug(("move_label_const %d, ?\n", w));
 }
 
 define_insn(move_int, move_RxR)
@@ -806,7 +804,7 @@
 
 	op_mov(w, r);
 
-	debug((DBOUT,"move_int %d, %d\n", w, r));
+	debug(("move_int %d, %d\n", w, r));
 }
 
 define_insn(move_float, fmove_RxR)
@@ -816,7 +814,7 @@
 
 	op_fmov(w, r);
 
-	debug((DBOUT,"move_float %d, %d\n", w, r));
+	debug(("move_float %d, %d\n", w, r));
 }
 
 define_insn(move_float_const, fmove_RxC)
@@ -850,7 +848,7 @@
 
 	op_fmov(w, r);
 
-	debug((DBOUT,"move_float_const %d, %f(0x%x)\n", w, o,r ));
+	debug(("move_float_const %d, %f(0x%x)\n", w, o,r ));
 }
 
 define_insn(move_double, fmovel_RxR)
@@ -860,7 +858,7 @@
 
 	op_fmovl(w, r);
 
-	debug((DBOUT,"move_double %d, %d\n", w, r));
+	debug(("move_double %d, %d\n", w, r));
 }
 
 define_insn(move_double_const, fmovel_RxC)
@@ -894,7 +892,7 @@
 
 	op_fmovl(w, r);
 
-	debug((DBOUT,"move_double_const %d, %f(0x%x)\n", w, o,r ));
+	debug(("move_double_const %d, %f(0x%x)\n", w, o,r ));
 }
 
 
@@ -908,7 +906,7 @@
 
 	op_add(w, r1, r2);
 
-	debug((DBOUT,"add_int %d, %d, %d\n", w, r1, r2));
+	debug(("add_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(add_int_const, add_RRC)
@@ -919,10 +917,10 @@
 
 	if ( o < 0 ) {
 		op_sub_const(w, r1, -o);
-		debug((DBOUT,"sub_int_const %d, %d, %d\n", w, r1, -o));
+		debug(("sub_int_const %d, %d, %d\n", w, r1, -o));
 	} else {
 		op_add_const(w, r1, o);
-		debug((DBOUT,"add_int_const %d, %d, %d\n", w, r1, o));
+		debug(("add_int_const %d, %d, %d\n", w, r1, o));
 	}
 }
 
@@ -934,7 +932,7 @@
 
 	op_adc(w, r1, r2);
 
-	debug((DBOUT,"adc_int %d, %d, %d\n", w, r1, r2));
+	debug(("adc_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(add_float, fadd_RRR)
@@ -945,7 +943,7 @@
 
 	op_fadd(w, r1, r2);
 
-	debug((DBOUT,"add_float %d, %d, %d\n", w, r1, r2));
+	debug(("add_float %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(add_double, faddl_RRR)
@@ -956,7 +954,7 @@
 
 	op_faddl(w, r1, r2);
 
-	debug((DBOUT,"add_double %d, %d, %d\n", w, r1, r2));
+	debug(("add_double %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(sub_int, sub_RRR)
@@ -967,7 +965,7 @@
 
 	op_sub(w, r1, r2);
 
-	debug((DBOUT,"sub_int %d, %d, %d\n", w, r1, r2));
+	debug(("sub_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(sub_int_const, sub_RRC)
@@ -978,13 +976,13 @@
 
 	if ( o < 0 ) {
 		op_add_const(w, r1, -o);
-		debug((DBOUT,"add_int_const %d, %d, %d\n", w, r1, -o));
+		debug(("add_int_const %d, %d, %d\n", w, r1, -o));
 	} else {
 		op_sub_const(w, r1, o);
-		debug((DBOUT,"add_int_const %d, %d, %d\n", w, r1, o));
+		debug(("add_int_const %d, %d, %d\n", w, r1, o));
 	}
 
-	debug((DBOUT,"sub_int_const %d, %d, %d\n", w, r1, 0));
+	debug(("sub_int_const %d, %d, %d\n", w, r1, 0));
 }
 
 define_insn(sbc_int, sbc_RRR)
@@ -995,7 +993,7 @@
 
 	op_sbc(w, r1, r2);
 
-	debug((DBOUT,"sbc_int %d, %d, %d\n", w, r1, r2));
+	debug(("sbc_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(sub_float, fsub_RRR)
@@ -1006,7 +1004,7 @@
 
 	op_fsub(w, r1, r2);
 
-	debug((DBOUT,"sub_float %d, %d, %d\n", w, r1, r2));
+	debug(("sub_float %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(sub_double, fsubl_RRR)
@@ -1017,7 +1015,7 @@
 
 	op_fsubl(w, r1, r2);
 
-	debug((DBOUT,"sub_double %d, %d, %d\n", w, r1, r2));
+	debug(("sub_double %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(mul_int, mul_RRR)
@@ -1028,7 +1026,7 @@
 
 	op_mul(w, r1, r2);
 
-	debug((DBOUT,"mul_int %d, %d, %d\n", w, r1, r2));
+	debug(("mul_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(mul_float, fmul_RRR)
@@ -1039,7 +1037,7 @@
 
 	op_fmul(w, r1, r2);
 
-	debug((DBOUT,"mul_float %d, %d, %d\n", w, r1, r2));
+	debug(("mul_float %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(mul_double, fmull_RRR)
@@ -1050,7 +1048,7 @@
 
 	op_fmull(w, r1, r2);
 
-	debug((DBOUT,"mul_double %d, %d, %d\n", w, r1, r2));
+	debug(("mul_double %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(div_float, fdiv_RRR)
@@ -1061,7 +1059,7 @@
 
 	op_fdiv(w, r1, r2);
 
-	debug((DBOUT,"div_float %d, %d, %d\n", w, r1, r2));
+	debug(("div_float %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(div_double, fdivl_RRR)
@@ -1072,7 +1070,7 @@
 
 	op_fdivl(w, r1, r2);
 
-	debug((DBOUT,"div_double %d, %d, %d\n", w, r1, r2));
+	debug(("div_double %d, %d, %d\n", w, r1, r2));
 }
 
 /* --------------------------------------------------------------------- */
@@ -1085,7 +1083,7 @@
 
 	op_and(w, r1, r2);
 
-	debug((DBOUT,"and_int %d, %d, %d\n", w, r1, r2));
+	debug(("and_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(and_int_const, and_RRC)
@@ -1096,7 +1094,7 @@
 
 	op_and_const(w, r1, o);
 
-	debug((DBOUT,"and_int_const %d, %d, %d\n", w, r1, 0));
+	debug(("and_int_const %d, %d, %d\n", w, r1, 0));
 }
 
 
@@ -1108,7 +1106,7 @@
 
 	op_or(w, r1, r2);
 
-	debug((DBOUT,"or_int %d, %d, %d\n", w, r1, r2));
+	debug(("or_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(xor_int, xor_RRR)
@@ -1119,7 +1117,7 @@
 
 	op_eor(w, r1, r2);
 
-	debug((DBOUT,"xor_int %d, %d, %d\n", w, r1, r2));
+	debug(("xor_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(ashr_int, ashr_RRR)
@@ -1130,7 +1128,7 @@
 
 	op_ashr(w, r1, r2);
 
-	debug((DBOUT,"ashr_int %d, %d, %d\n", w, r1, r2));
+	debug(("ashr_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(lshr_int, lshr_RRR)
@@ -1141,7 +1139,7 @@
 
 	op_lshr(w, r1, r2);
 
-	debug((DBOUT,"lshr_int %d, %d, %d\n", w, r1, r2));
+	debug(("lshr_int %d, %d, %d\n", w, r1, r2));
 }
 
 define_insn(lshl_int, lshl_RRR)
@@ -1152,7 +1150,7 @@
 
 	op_lshl(w, r1, r2);
 
-	debug((DBOUT,"lshl_int %d, %d, %d\n", w, r1, r2));
+	debug(("lshl_int %d, %d, %d\n", w, r1, r2));
 }
 
 /* --------------------------------------------------------------------- */
@@ -1164,7 +1162,7 @@
 
 	op_load_sb(w, r);
 
-	debug((DBOUT,"load_byte %d, [%d]\n", w, r));
+	debug(("load_byte %d, [%d]\n", w, r));
 }
 
 define_insn(load_char, loadc_RxR)
@@ -1174,7 +1172,7 @@
 
 	op_load_sh(w, r);
 
-	debug((DBOUT,"load_char %d, [%d]\n", w, r));
+	debug(("load_char %d, [%d]\n", w, r));
 }
 
 define_insn(load_short, loads_RxR)
@@ -1184,7 +1182,7 @@
 
 	op_load_sh(w, r);
 
-	debug((DBOUT,"load_short %d, [%d]\n", w, r));
+	debug(("load_short %d, [%d]\n", w, r));
 }
 
 define_insn(load_int, load_RxR)
@@ -1194,7 +1192,7 @@
 
 	op_load(w, r);
 
-	debug((DBOUT,"ld %d, [%d]\n", w, r));
+	debug(("ld %d, [%d]\n", w, r));
 }
 
 define_insn(load_offset_int, load_RRC)
@@ -1205,7 +1203,7 @@
 
 	op_load_offset(w,r,o);
 
-	debug((DBOUT,"ld %d,[%d+%d]\n", w, r, o));
+	debug(("ld %d,[%d+%d]\n", w, r, o));
 }
 
 define_insn(load_float, fload_RxR)
@@ -1215,7 +1213,7 @@
 
 	op_fload(w, r);
 
-	debug((DBOUT,"load_float %d, [%d]\n", w, r));
+	debug(("load_float %d, [%d]\n", w, r));
 }
 
 define_insn(load_double, floadl_RxR)
@@ -1225,7 +1223,7 @@
 
 	op_floadl(w, r);
 
-	debug((DBOUT,"load_double %d, [%d]\n", w, r));
+	debug(("load_double %d, [%d]\n", w, r));
 }
 
 define_insn(store_byte, storeb_xRR)
@@ -1234,7 +1232,7 @@
 	int r = rreg_int(1);
 
 	op_store_b(w, r);
-	debug((DBOUT,"store_byte %d, [%d]\n", r, w));
+	debug(("store_byte %d, [%d]\n", r, w));
 }
 
 define_insn(store_short, stores_xRR)
@@ -1244,7 +1242,7 @@
 
 	op_store_h(w, r);
 
-	debug((DBOUT,"store_short %d, [%d]\n", r, w));
+	debug(("store_short %d, [%d]\n", r, w));
 }
 
 define_insn(store_int, store_xRR)
@@ -1254,7 +1252,7 @@
 
 	op_store(r, w);
 
-	debug((DBOUT,"store_int %d, [%d]\n", r, w));
+	debug(("store_int %d, [%d]\n", r, w));
 }
 
 define_insn(store_offset_int, store_xRRC)
@@ -1265,7 +1263,7 @@
 
 	op_store_offset(r,w,o);
 
-	debug((DBOUT,"st %d,[%d+%d]\n", r, w, o));
+	debug(("st %d,[%d+%d]\n", r, w, o));
 }
 
 define_insn(store_float, fstore_RxR)
@@ -1275,7 +1273,7 @@
 
 	op_fstore(r, w);
 
-	debug((DBOUT,"store_float %d, [%d]\n", r, w));
+	debug(("store_float %d, [%d]\n", r, w));
 }
 
 define_insn(store_double, fstorel_RxR)
@@ -1285,7 +1283,7 @@
 
 	op_fstorel(r, w);
 
-	debug((DBOUT,"store_double %d, [%d]\n", r, w));
+	debug(("store_double %d, [%d]\n", r, w));
 }
 
 /* --------------------------------------------------------------------- */
@@ -1297,7 +1295,7 @@
 
 	op_cmp(r1, r2);
 
-	debug((DBOUT,"cmp_int r%d, r%d\n", r1, r2));
+	debug(("cmp_int r%d, r%d\n", r1, r2));
 }
 
 define_insn(cmp_int_const, cmp_xRC)
@@ -1307,7 +1305,7 @@
 
 	op_cmp_const(r, o);
 
-	debug((DBOUT,"cmp_int_const r%d, #%d\n", r, o));
+	debug(("cmp_int_const r%d, #%d\n", r, o));
 }
 
 define_insn(cmp_ref, cmpref_xRR)
@@ -1317,7 +1315,7 @@
 
 	op_cmp(r1, r2);
 
-	debug((DBOUT,"cmp_ref r%d, r%d\n", r1, r2));
+	debug(("cmp_ref r%d, r%d\n", r1, r2));
 }
 
 define_insn(cmp_ref_const, cmpref_xRC)
@@ -1327,7 +1325,7 @@
 
 	op_cmp_const(r, o);
 
-	debug((DBOUT,"cmp_ref_const r%d, #%d\n", r, o));
+	debug(("cmp_ref_const r%d, #%d\n", r, o));
 }
 
 
@@ -1338,7 +1336,7 @@
 	int r = rreg_int(2); /* CHECKME */
 	int w = wreg_float(0);
 	op_cvt_i2f(w,r);
-	debug((DBOUT,"cvt_int_float %d, %d\n", w, r));
+	debug(("cvt_int_float %d, %d\n", w, r));
 }
 
 define_insn(cvt_int_double, cvtid_RxR)
@@ -1346,7 +1344,7 @@
 	int r = rreg_int(2);
 	int w = wreg_double(0);
 	op_cvt_i2d(w,r);
-	debug((DBOUT,"cvt_int_double %d, %d\n", w, r));
+	debug(("cvt_int_double %d, %d\n", w, r));
 }
 
 define_insn(cvt_float_int, cvtfi_RxR)
@@ -1354,7 +1352,7 @@
 	int r = rreg_float(2);
 	int w = wreg_int(0);
 	op_cvt_f2i(w,r);
-	debug((DBOUT,"cvt_float_int r%d, f%d\n", w, r));
+	debug(("cvt_float_int r%d, f%d\n", w, r));
 }
 
 define_insn(cvt_int_double, cvtdi_RxR)
@@ -1362,7 +1360,7 @@
 	int r = rreg_double(2);
 	int w = wreg_int(0);
 	op_cvt_f2i(w,r);
-	debug((DBOUT,"cvt_double_int %d, %d\n", w, r));
+	debug(("cvt_double_int %d, %d\n", w, r));
 }
 
 #if 0
@@ -1370,12 +1368,12 @@
 define_insn(cvt_long_float, cvtlf_RxR)
 {
 	/* Is a long a 64-bit quantity? */
-	debug((DBOUT,"NOT IMPLEMENTED: cvt_long_float\n"));
+	debug(("NOT IMPLEMENTED: cvt_long_float\n"));
 }
 
 define_insn(cvt_long_double, cvtld_RxR)
 {
-	debug((DBOUT,"NOT IMPLEMENTED: cvt_long_double\n"));
+	debug(("NOT IMPLEMENTED: cvt_long_double\n"));
     }
 #endif
 
@@ -1384,7 +1382,7 @@
 	int r = rreg_float(2);
 	int w = wreg_double(0);
 	op_fmovl(w,r);
-	debug((DBOUT,"cvt_float_double f%d, f%d\n",w,r));
+	debug(("cvt_float_double f%d, f%d\n",w,r));
 }
 
 define_insn(cvt_double_float, cvtdf_RxR)
@@ -1392,7 +1390,7 @@
 	int r = rreg_double(2);
 	int w = wreg_float(0);
 	op_fmov(w,r);
-	debug((DBOUT,"cvt_double_float f%d, f%d\n",w,r));
+	debug(("cvt_double_float f%d, f%d\n",w,r));
 }
 
 /* --------------------------------------------------------------------- */
@@ -1403,7 +1401,7 @@
 
 	LOUT = val;
 
-	debug((DBOUT,"build_key %d", val));
+	debug(("build_key %d", val));
 }
 
 define_insn(build_code_ref, set_wordpc_xxC)
@@ -1415,7 +1413,7 @@
 	l->from = CODEPC;
 	LOUT = 0;
 
-	debug((DBOUT,"build_code_ref (@0x%x from 0x%x)\n", l->at, l->from));
+	debug(("build_code_ref (@0x%x from 0x%x)\n", l->at, l->from));
 }
 
 /* --------------------------------------------------------------------- */
@@ -1426,7 +1424,7 @@
 
 	l->to = CODEPC;
 
-	debug((DBOUT,"set_label (@0x%x to 0x%x)\n", l->at, l->to));
+	debug(("set_label (@0x%x to 0x%x)\n", l->at, l->to));
 }
 
 define_insn(branch, branch_xCC)
@@ -1474,7 +1472,7 @@
 		abort();
 	}
 
-	debug((DBOUT,"branch type %d at 0x%x from 0x%x\n", bt, l -> at, l -> from));
+	debug(("branch type %d at 0x%x from 0x%x\n", bt, l -> at, l -> from));
 }
 
 #if 0
@@ -1505,7 +1503,7 @@
 	op_mov(LR, PC);
 	op_mov(PC, r);
 
-	debug((DBOUT,"call [%d]\n", r));
+	debug(("call [%d]\n", r));
 }
 
 define_insn(branch_indirect, branch_indirect_xRC)
@@ -1513,7 +1511,7 @@
 	int r = rreg_int(1);
 	assert(const_int(2) == ba);
 	op_mov(PC, r);
-	debug((DBOUT,"branch_indirect [r%d]\n", r));
+	debug(("branch_indirect [r%d]\n", r));
 }
 
 define_insn(push_int, push_xRC)
@@ -1538,12 +1536,12 @@
 		if (r != w) {
 			op_mov(w, r);
 
-			debug((DBOUT,"push_int via mov %d,%d\n", w, r));
+			debug(("push_int via mov %d,%d\n", w, r));
 		} 
 	}
 	else {
 		op_push(SP, r);
-		debug((DBOUT,"push_int via push SP,r%d\n", r));
+		debug(("push_int via push SP,r%d\n", r));
 	}
 
 }
@@ -1572,7 +1570,7 @@
 		 * Now pop it into the register pair
 		 */
 		op_pop_m(SP, (1 << w));
-		debug((DBOUT,"push_float via elaborate mov r(%d) := f%d\n", w, r));
+		debug(("push_float via elaborate mov r(%d) := f%d\n", w, r));
 		break;
 
 	default:
@@ -1581,7 +1579,7 @@
 		 */
 		r = rreg_float(1);
 		op_fpush(SP, r);
-		debug((DBOUT,"push_float via SP, f%d\n", r));
+		debug(("push_float via SP, f%d\n", r));
 		break;
 	}
 }
@@ -1612,7 +1610,7 @@
 		 * Now pop it into the register pair
 		 */
 		op_pop_m(SP, (1 << w) | (1 << (w+1)));
-		debug((DBOUT,"push_double via elaborate mov r(%d,%d) := f%d\n", w, w+1, r));
+		debug(("push_double via elaborate mov r(%d,%d) := f%d\n", w, w+1, r));
 		break;
 
 	case 3:
@@ -1627,7 +1625,7 @@
 
 		/* Pop the first word */
 		op_pop_m(SP, (1 << w));
-		debug((DBOUT,"push_double via partial register, partial stack SP, f%d\n", r));
+		debug(("push_double via partial register, partial stack SP, f%d\n", r));
 		break;
 
 	default:
@@ -1636,7 +1634,7 @@
 		 */
 		r = rreg_double(1);
 		op_fpushl(SP, r);
-		debug((DBOUT,"push_double via SP, f%d\n", r));
+		debug(("push_double via SP, f%d\n", r));
 		break;
 	}
 }
@@ -1657,9 +1655,9 @@
 		assert(__I8const_rangecheck(o >> 2));
 		op_add_c(SP, SP, (o >> 2), 30);
 
-		debug((DBOUT,"popargs SP, SP, %d\n", o));
+		debug(("popargs SP, SP, %d\n", o));
 	} else {
-		debug((DBOUT,"null popargs with %d args\n", const_int(2)));
+		debug(("null popargs with %d args\n", const_int(2)));
 	}
 }
 
@@ -1669,7 +1667,7 @@
 
 	xop_mov(R0, r);
 
-	debug((DBOUT,"returnarg_int R0,%d\n", r));
+	debug(("returnarg_int R0,%d\n", r));
 }
 
 define_insn(returnarg_long, returnargl_xxR)
@@ -1682,7 +1680,7 @@
 	r1 = _slowSlotRegister(r, Rint, rread);
 	r2 = _slowSlotRegister(r+1, Rint, rread);
 
-	debug((DBOUT,"returnarg_long R0,%d,%d\n", r1, r2));
+	debug(("returnarg_long R0,%d,%d\n", r1, r2));
 
 	/* Return long is a bit complicated since part of the source may
 	 * be the destination.
@@ -1713,7 +1711,7 @@
 
 	xop_fmov(F0, r);
 
-	debug((DBOUT,"returnarg_float R0,%d\n", r));
+	debug(("returnarg_float R0,%d\n", r));
 }
 
 define_insn(returnarg_double, freturnargl_xxR)
@@ -1722,14 +1720,14 @@
 
 	xop_fmovl(F0, r);
 
-	debug((DBOUT,"returnarg_double R0,%d\n", r));
+	debug(("returnarg_double R0,%d\n", r));
 }
 
 define_insn(return_int, return_Rxx)
 {
 	forceRegister(seq_dst(s), R0, Rint);
 
-	debug((DBOUT,"return_int R0\n"));
+	debug(("return_int R0\n"));
 }
 
 define_insn(return_long, returnl_Rxx)
@@ -1737,21 +1735,21 @@
 	forceRegister(seq_dst(s), R0, Rint);
 	forceRegister(seq_dst(s)+1, R1, Rint);
 
-	debug((DBOUT,"return_long R0,R1\n"));
+	debug(("return_long R0,R1\n"));
 }
 
 define_insn(return_float, freturn_Rxx)
 {
 	forceRegister(seq_dst(s), Reg_F0, Rfloat);
 
-	debug((DBOUT,"return_float F0\n"));
+	debug(("return_float F0\n"));
 }
 
 define_insn(return_double, freturnl_Rxx)
 {
 	forceRegister(seq_dst(s), Reg_F0, Rdouble);
 
-	debug((DBOUT,"return_double F0\n"));
+	debug(("return_double F0\n"));
 }
 
 /* --------------------------------------------------------------------- */


More information about the kaffe mailing list