X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightning%2Flib%2Fjit_print.c;h=a6f93380351bdb642c046e8af8ba30ddee66c6f7;hb=c0c162422385a60ea7c8fa1dfe439e83e0a13d88;hp=fc4ab8741003bd14ad9980e90bff314d7e9d48e8;hpb=9abd586c96e8a2e37e92b620c70668a57d6f89f7;p=pcsx_rearmed.git

diff --git a/deps/lightning/lib/jit_print.c b/deps/lightning/lib/jit_print.c
index fc4ab874..a6f93380 100644
--- a/deps/lightning/lib/jit_print.c
+++ b/deps/lightning/lib/jit_print.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2019  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2022  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -20,12 +20,25 @@
 #include <lightning.h>
 #include <lightning/jit_private.h>
 
-#define print_chr(value)		fputc(value, stdout)
-#define print_hex(value)		fprintf(stdout, "0x%lx", value)
-#define print_dec(value)		fprintf(stdout, "%ld", value)
-#define print_flt(value)		fprintf(stdout, "%g", value)
-#define print_str(value)		fprintf(stdout, "%s", value)
-#define print_ptr(value)		fprintf(stdout, "%p", value)
+#if __WORDSIZE == 32
+#  define MININT                0x80000000
+#else
+#  define MININT                0x8000000000000000
+#endif
+
+
+#define print_chr(value)		fputc(value, print_stream)
+#define print_hex(value)						\
+    do {								\
+	if (value < 0 && value != MININT)				\
+	    fprintf(print_stream, "-0x%lx", -value);			\
+	else								\
+	    fprintf(print_stream, "0x%lx", value);			\
+    } while (0)
+#define print_dec(value)		fprintf(print_stream, "%ld", value)
+#define print_flt(value)		fprintf(print_stream, "%g", value)
+#define print_str(value)		fprintf(print_stream, "%s", value)
+#define print_ptr(value)		fprintf(print_stream, "%p", value)
 #define print_reg(value)						\
     do {								\
 	if ((value) & jit_regno_patch)					\
@@ -45,10 +58,22 @@
  * Initialization
  */
 #include "jit_names.c"
+/*
+ * Initialization
+ */
+static FILE	*print_stream;
+
 
 /*
  * Implementation
  */
+void
+jit_init_print(void)
+{
+    if (!print_stream)
+	print_stream = stdout;
+}
+
 void
 _jit_print(jit_state_t *_jit)
 {
@@ -95,7 +120,7 @@ _jit_print_node(jit_state_t *_jit, jit_node_t *node)
 	(jit_cc_a0_int|jit_cc_a0_flt|jit_cc_a0_dbl|jit_cc_a0_jmp|
 	 jit_cc_a0_reg|jit_cc_a0_rlh|jit_cc_a0_arg|
 	 jit_cc_a1_reg|jit_cc_a1_int|jit_cc_a1_flt|jit_cc_a1_dbl|jit_cc_a1_arg|
-	 jit_cc_a2_reg|jit_cc_a2_int|jit_cc_a2_flt|jit_cc_a2_dbl);
+	 jit_cc_a2_reg|jit_cc_a2_int|jit_cc_a2_flt|jit_cc_a2_dbl|jit_cc_a2_rlh);
     if (!(node->flag & jit_flag_synth) && ((value & jit_cc_a0_jmp) ||
 					   node->code == jit_code_finishr ||
 					   node->code == jit_code_finishi))
@@ -205,6 +230,18 @@ _jit_print_node(jit_state_t *_jit, jit_node_t *node)
 	    print_chr(' ');	print_reg(node->u.q.h);
 	    print_str(") ");	print_reg(node->v.w);
 	    print_chr(' ');	print_hex(node->w.w);   return;
+	r_r_q:
+	    print_chr(' ');	print_reg(node->u.w);
+	    print_chr(' ');	print_reg(node->v.w);
+	    print_str(" (");	print_reg(node->w.q.l);
+	    print_chr(' ');	print_reg(node->w.q.h);
+	    print_str(") ");	return;
+	r_w_q:
+	    print_chr(' ');	print_reg(node->u.w);
+	    print_chr(' ');	print_hex(node->v.w);
+	    print_str(" (");	print_reg(node->w.q.l);
+	    print_chr(' ');	print_reg(node->w.q.h);
+	    print_str(") ");	return;
 	r_r_f:
 	    print_chr(' ');	print_reg(node->u.w);
 	    print_chr(' ');	print_reg(node->v.w);
@@ -280,12 +317,12 @@ _jit_print_node(jit_state_t *_jit, jit_node_t *node)
 	case jit_code_name:
 	    print_chr(' ');
 	    if (node->v.p && _jitc->emit)
-		print_ptr(node->v.n->u.p);
+		print_str((char *)node->v.n->u.p);
 	    break;
 	case jit_code_note:
 	    print_chr(' ');
 	    if (node->v.p && _jitc->emit)
-		print_ptr(node->v.n->u.p);
+		print_str((char *)node->v.n->u.p);
 	    if (node->v.p && _jitc->emit && node->w.w)
 		print_chr(':');
 	    if (node->w.w)
@@ -345,6 +382,12 @@ _jit_print_node(jit_state_t *_jit, jit_node_t *node)
 		case jit_cc_a0_reg|jit_cc_a0_rlh|
 		     jit_cc_a1_reg|jit_cc_a2_int:
 		    goto q_r_w;
+		case jit_cc_a0_reg|jit_cc_a1_reg|
+		    jit_cc_a2_reg|jit_cc_a2_rlh:
+		    goto r_r_q;
+		case jit_cc_a0_reg|jit_cc_a1_int|
+		    jit_cc_a2_reg|jit_cc_a2_rlh:
+		    goto r_w_q;
 		case jit_cc_a0_reg|jit_cc_a1_reg|jit_cc_a2_flt:
 		    goto r_r_f;
 		case jit_cc_a0_reg|jit_cc_a1_reg|jit_cc_a2_dbl: