X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightning%2Fcheck%2Flightning.c;h=3d916f794e9fa84ca1ccac0643779c5b26bbee96;hb=8622c9dcd0abc62601ff6c64f93f9294c520ed58;hp=3cf3e70dd385620dabefb0c348ab380e95429aa8;hpb=437b1e617808119c3a24a72c77cd2fa86a5d3220;p=pcsx_rearmed.git

diff --git a/deps/lightning/check/lightning.c b/deps/lightning/check/lightning.c
index 3cf3e70d..3d916f79 100644
--- a/deps/lightning/check/lightning.c
+++ b/deps/lightning/check/lightning.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.
  *
@@ -316,6 +316,7 @@ static void ger_u(void);	static void gei_u(void);
 static void gtr(void);		static void gti(void);
 static void gtr_u(void);	static void gti_u(void);
 static void ner(void);		static void nei(void);
+static void casr(void);		static void casi(void);
 static void movr(void);		static void movi(void);
 static void extr_c(void);	static void extr_uc(void);
 static void extr_s(void);	static void extr_us(void);
@@ -636,6 +637,7 @@ static instr_t		  instr_vector[] = {
     entry(gtr),		entry(gti),
     entry(gtr_u),	entry(gti_u),
     entry(ner),		entry(nei),
+    entry(casr),	entry(casi),
     entry(movr),	entry(movi),
     entry(extr_c),	entry(extr_uc),
     entry(extr_s),	entry(extr_us),
@@ -1028,6 +1030,16 @@ name(void)								\
     jit_word_t	im = get_imm();						\
     jit_##name(r0, r1, r2, im);						\
 }
+#define entry_ir_im_ir_ir(name)						\
+static void								\
+name(void)								\
+{									\
+    jit_gpr_t	r0 = get_ireg();					\
+    jit_word_t	im = get_imm();						\
+    jit_gpr_t r1 = get_ireg(), r2 = get_ireg();				\
+    jit_##name(r0, im, r1, r2);						\
+}
+
 #define entry_ir_ir(name)						\
 static void								\
 name(void)								\
@@ -1443,6 +1455,7 @@ entry_ir_ir_ir(ger_u)		entry_ir_ir_im(gei_u)
 entry_ir_ir_ir(gtr)		entry_ir_ir_im(gti)
 entry_ir_ir_ir(gtr_u)		entry_ir_ir_im(gti_u)
 entry_ir_ir_ir(ner)		entry_ir_ir_im(nei)
+entry_ir_ir_ir_ir(casr)		entry_ir_im_ir_ir(casi)
 entry_ir_ir(movr)
 static void
 movi(void)
@@ -3816,6 +3829,11 @@ execute(int argc, char *argv[])
 	jit_disassemble();
 	fprintf(stderr, "  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n");
     }
+    if (flag_verbose && argc) {
+	for (result = 0; result < argc; result++)
+	    printf("argv[%d] = %s\n", result, argv[result]);
+	fprintf(stderr, "  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n");
+    }
 
     jit_clear_state();
     if (flag_disasm)
@@ -4015,12 +4033,11 @@ usage(void)
 {
 #if HAVE_GETOPT_LONG_ONLY
     fprintf(stderr, "\
-Usage: %s [jit assembler options] file [jit program options]\n\
+Usage: %s [jit assembler options] file [--] [jit program options]\n\
 Jit assembler options:\n\
   -help                    Display this information\n\
   -v[0-3]                  Verbose output level\n\
-  -d                       Do not use a data buffer\n\
-  -D<macro>[=<val>]        Preprocessor options\n"
+  -d                       Do not use a data buffer\n"
 #  if defined(__i386__) && __WORDSIZE == 32
 "  -mx87=1                  Force using x87 when sse2 available\n"
 #  endif
@@ -4036,11 +4053,10 @@ Jit assembler options:\n\
 	    , progname);
 #else
     fprintf(stderr, "\
-Usage: %s [jit assembler options] file [jit program options]\n\
+Usage: %s [jit assembler options] file [--] [jit program options]\n\
 Jit assembler options:\n\
   -h                       Display this information\n\
-  -v                       Verbose output level\n\
-  -D<macro>[=<val>]        Preprocessor options\n", progname);
+  -v                       Verbose output level\n", progname);
 #endif
     finish_jit();
     exit(1);
@@ -4215,16 +4231,6 @@ main(int argc, char *argv[])
 #  define cc "gcc"
 #endif
     opt_short = snprintf(cmdline, sizeof(cmdline), cc " -E -x c %s", argv[opt_index]);
-    for (++opt_index; opt_index < argc; opt_index++) {
-	if (argv[opt_index][0] == '-')
-	    opt_short += snprintf(cmdline + opt_short,
-				  sizeof(cmdline) - opt_short,
-				  " %s", argv[opt_index]);
-	else {
-	    --opt_index;
-	    break;
-	}
-    }
     opt_short += snprintf(cmdline + opt_short,
 			  sizeof(cmdline) - opt_short,
 			  " -D__WORDSIZE=%d", __WORDSIZE);