Fix the windows build

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: ci
 
 env:
-  R2V: 5.9.0
+  R2V: 5.9.2
 
 on:
   push:

configure

@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script was automatically generated by ACR v2.1.2
+# This script was automatically generated by ACR v2.1.4
 # @author: pancake <nopcode.org>
 # @url:    http://www.nopcode.org
 # @repo:   git clone https://github.com/radare/acr
@@ -112,12 +112,12 @@ done
 : ${INSTALL_PROGRAM_STRIP:=${INSTALL} -m 755 -s}
 : ${INSTALL_MAN:=${INSTALL} -m 444}
 : ${INSTALL_LIB:=${INSTALL} -m 755 -c}
- PKGNAME='r2ghidra' ; VERSION='5.9.1' ; VERSION_MAJOR=5; VERSION_MINOR=9; VERSION_PATCH=1; VERSION_NUMBER=50901; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
+ PKGNAME='r2ghidra' ; VERSION='5.9.2' ; VERSION_MAJOR=5; VERSION_MINOR=9; VERSION_PATCH=2; VERSION_NUMBER=50902; CONTACT_MAIL="pancake@nopcode.org" ; CONTACT_NAME="pancake" ; CONTACT="pancake <pancake@nopcode.org>" ;
 }
 
 show_usage() {
 cat <<EOF2
-'configure' configures r2ghidra-5.9.1 to adapt to many kinds of systems.
+'configure' configures r2ghidra-5.9.2 to adapt to many kinds of systems.
 
 Usage: ./configure [OPTION]... [VAR=VALUE]...
 
@@ -189,10 +189,10 @@ ocho() {
 
 show_version() {
 if [ "$QUIET" = 1 ]; then
-	echo "5.9.1"
+	echo "5.9.2"
 	exit 0
 fi
-echo "r2ghidra-5.9.1 configuration script done with acr v2.1.2.
+echo "r2ghidra-5.9.2 configuration script done with acr v2.1.4.
 The 'Free Software Foundation' message is only for autodetection.
 Originally written by pancake <nopcode.org>."
 exit 0
@@ -221,7 +221,7 @@ case $flag in
 	show_version ; ;;
 -r|--r|--report)
 echo "PKGNAME:     r2ghidra"
-echo "VERSION:     5.9.1"
+echo "VERSION:     5.9.2"
 echo "AUTHOR:      pancake"
 echo "EMAIL:       pancake@nopcode.org"
 echo "LANGS:       c++"
@@ -364,6 +364,7 @@ fi
 	echo "error: This program is required." >&2
 	exit 1 ; fi
 ochof "checking for pkg-config... "
+ENVWORDS="${ENVWORDS} HAVE_PKGCONFIG"
 if [ -n "$PKGCONFIG" ]; then
 	if [ -x "$PKGCONFIG" ]; then
 		_HAVE_PKGCONFIG="${PKGCONFIG}"
@@ -387,7 +388,9 @@ else
 fi
 if [ -n "${PKGCONFIG}" ]; then
 	ocho ${PKGCONFIG}
+	HAVE_PKGCONFIG=1
 else
+	HAVE_PKGCONFIG=0
 	echo "Cannot find pkg-config or pkgconf in PATH" >&2
 	exit 1
 ocho no; fi

configure.acr

@@ -1,5 +1,5 @@
 PKGNAME r2ghidra
-VERSION 5.9.1
+VERSION 5.9.2
 CONTACT pancake ; pancake@nopcode.org
 
 LANG_CXX!

meson.build

@@ -3,7 +3,7 @@ project(
   ['c', 'cpp'],
   license : 'LGPL3',
   meson_version : '>=0.50.1',
-version : '5.9.1',
+version : '5.9.2',
   default_options : ['c_std=c11', 'cpp_std=c++11']
 )
 

src/SleighAnalValue.cpp

@@ -1,4 +1,4 @@
-/* r2ghidra - LGPL - Copyright 2020-2023 - FXTi, pancake */
+/* r2ghidra - LGPL - Copyright 2020-2024 - FXTi, pancake */
 
 #include "SleighAnalValue.h"
 
@@ -70,7 +70,11 @@ SleighAnalValue SleighAnalValue::resolve_arg(RAnal *anal, const PcodeOperand *ar
 				res.imm = (curr_op->type == CPUI_INT_ADD)? in0.imm + in1.imm : in0.imm - in1.imm;
 			} else {
 				res.base = in0.imm + in0.base;
-				res.base += (curr_op->type == CPUI_INT_ADD)? (in1.imm + in1.base) : -(in1.imm + in1.base);
+				if (curr_op->type == CPUI_INT_ADD) {
+					res.base += (in1.imm + in1.base);
+				} else {
+					res.base -= (in1.imm + in1.base);
+				}
 			}
 			res.mul = inner_max(in0.mul, in1.mul); // Only one of inputs should set mul
 			res.delta = inner_max(in0.delta, in1.delta);

src/anal_ghidra_plugin.c

@@ -1,4 +1,4 @@
-/* r2ghidra - LGPL - Copyright 2020-2023 - pancake */
+/* r2ghidra - LGPL - Copyright 2020-2024 - pancake */
 
 #include <r_lib.h>
 #include <r_anal.h>
@@ -8,7 +8,6 @@
 #define RAnalEsil REsil
 #endif
 
-
 #if R2_VERSION_NUMBER >= 50809
 extern int archinfo(RArchSession *as, ut32 query);
 extern bool sanal_init(RArchSession *as);
@@ -17,9 +16,8 @@ extern RList *r2ghidra_preludes(RArchSession *as);
 extern int archinfo(RArchSession *as, ut32 query);
 extern char *r2ghidra_regs(RArchSession *as);
 extern bool r2ghidra_esilcb(RArchSession *as, RArchEsilAction action);
-// extern bool sleigh_decode(RArchSession *as, RAnal *a, RAnalOp *anal_op, ut64 addr, const ut8 *data, int len, RAnalOpMask mask);
 extern char *get_reg_profile(RAnal *anal);
-static bool sleigh_decode(RArchSession *as, RAnalOp *op, RArchDecodeMask mask);
+bool sleigh_decode(RArchSession *as, RAnalOp *op, RArchDecodeMask mask);
 
 RArchPlugin r_arch_plugin_ghidra = {
 	.meta = {

src/r2ghidra.h

@@ -1,6 +1,7 @@
 #ifndef R2GHIDRA_H
 #define R2GHIDRA_H
 
+#undef R_LOG_ORIGIN
 #define R_LOG_ORIGIN "r2ghidra"
 
 #include <r_core.h>