Don't define radare_plugin when built into libr via XPS

.github/workflows/ci.yml

@@ -1,7 +1,7 @@
 name: CI
 
 env:
-  R2V: 6.2.4
+  R2V: 6.2.6
 
 permissions:
   contents: write

.gitignore

@@ -1,3 +1,4 @@
+.pmai/
 build/
 bin/
 third_party/

meson.build

@@ -1,7 +1,7 @@
 project(
   'r2hermes',
   'c',
-  version: '1.6.0',
+  version: '1.6.2',
   license: 'MIT',
   default_options: [
     'c_std=c11',

src/lib/decompilation/decompiler.c

@@ -2962,7 +2962,7 @@ Result _hbc_output_code(HermesDecompiler *state, DecompiledFunctionBody *functio
 	for (HbcTokenString *si_iter = R_VEC_START_ITER (&function_body->statements); si_iter != R_VEC_END_ITER (&function_body->statements); si_iter++) {
 		size_t si = (size_t) (si_iter - R_VEC_START_ITER (&function_body->statements));
 		/* Stop when budget exhausted or earlier phase (pass2) flagged it. */
-		if (state->output_truncated || (state->options.max_output_bytes > 0 && r_strbuf_length (out) >= state->options.max_output_bytes)) {
+		if (state->output_truncated || (state->options.max_output_bytes > 0 && r_strbuf_length (out) >= (size_t)state->options.max_output_bytes)) {
 			state->output_truncated = true;
 			if (!state->truncation_marker_emitted) {
 				state->truncation_marker_emitted = true;

src/r2/core_hbc_one.c

@@ -3,16 +3,23 @@
 /* Core HBC plugin with plugin registration enabled for r2one */
 
 #define HBC_CORE_REGISTER_PLUGINS 1
+// radare2 defines R2_PLUGIN_INCORE when linking us statically (XPS)
+#ifdef R2_PLUGIN_INCORE
+#define HBC_STATIC_INCORE 1
+#else
 #define R2_PLUGIN_INCORE 1
+#endif
 #include "asm_hbc.c"
 #include "bin_hbc.c"
 #include "arch_hbc.c"
 #undef HBC_VADDR_BASE
 #include "core_hbc.c"
 
+#ifndef HBC_STATIC_INCORE
 R_API RLibStruct radare_plugin = {
 	.type = R_LIB_TYPE_CORE,
 	.data = (void *)&r_core_plugin_r2hermes,
 	.version = R2_VERSION,
 	.abiversion = R2_ABIVERSION
 };
+#endif

test/db/extras/hbc-disasm

@@ -146,7 +146,7 @@ RUN
 NAME=hbc exception handlers are exposed through bin metadata
 FILE=bins/hbc/index.android.bundle
 CMDS=<<EOF
-iw~try.0
+iw*~try.0
 EOF
 EXPECT=<<EOF
 f try.0.1003e6dc.from=0x1003e703