From: Andrea Corallo <andrea_corallo@yahoo.it>
Date: Sat, 10 Aug 2019 18:21:43 +0000 (+0200)
Subject: change emit_limple_call_ref arg convention
X-Git-Tag: emacs-28.0.90~2727^2~1307
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a42d67628942244b0cb90276c4e0ec77e967c0bc;p=emacs.git

change emit_limple_call_ref arg convention
---

diff --git a/src/comp.c b/src/comp.c
index 6552ea91c14..3a9fbe733da 100644
--- a/src/comp.c
+++ b/src/comp.c
@@ -1097,7 +1097,8 @@ emit_limple_call (Lisp_Object args)
 {
   Lisp_Object calle_sym = FIRST (args);
   char *calle = (char *) SDATA (SYMBOL_NAME (calle_sym));
-  Lisp_Object emitter = Fgethash (SYMBOL_NAME (calle_sym), comp.routine_dispatcher, Qnil);
+  Lisp_Object emitter =
+    Fgethash (SYMBOL_NAME (calle_sym), comp.routine_dispatcher, Qnil);
 
   if (!NILP (emitter))
     {
@@ -1117,13 +1118,13 @@ emit_limple_call (Lisp_Object args)
 }
 
 static gcc_jit_rvalue *
-emit_limple_call_ref (Lisp_Object arg1)
+emit_limple_call_ref (Lisp_Object args)
 {
   /* Ex: (callref Fplus 2 0).  */
 
-  char *calle = (char *) SDATA (SYMBOL_NAME (SECOND (arg1)));
-  EMACS_UINT nargs = XFIXNUM (THIRD (arg1));
-  EMACS_UINT base_ptr = XFIXNUM (FORTH (arg1));
+  char *calle = (char *) SDATA (SYMBOL_NAME (FIRST (args)));
+  EMACS_UINT nargs = XFIXNUM (SECOND (args));
+  EMACS_UINT base_ptr = XFIXNUM (THIRD (args));
   gcc_jit_rvalue *gcc_args[2] =
     { gcc_jit_context_new_rvalue_from_int (comp.ctxt,
 					   comp.ptrdiff_type,
@@ -1285,7 +1286,7 @@ emit_limple_insn (Lisp_Object insn)
       else if (EQ (FIRST (arg1), Qcall))
 	res = emit_limple_call (XCDR (arg1));
       else if (EQ (FIRST (arg1), Qcallref))
-	res = emit_limple_call_ref (arg1);
+	res = emit_limple_call_ref (XCDR (arg1));
       else
 	error ("LIMPLE inconsistent arg1 for op =");
       eassert (res);