@@ -68,7 +68,6 @@ static inline int bcfail(const char *msg, long a, long b,

 #define CHECK_EQ(a,b)

 #define CHECK_GT(a,b)

 #endif

-

 #ifdef CL_DEBUG

 #define CHECK_UNREACHABLE do { cli_dbgmsg("bytecode: unreachable executed!\n"); return CL_EBYTECODE; } while(0)

 #define TRACE_R(x) cli_dbgmsg("bytecode trace: %u, read %llx\n", pc, (long long)x);

@@ -287,7 +286,11 @@ static always_inline struct stack_entry *pop_stack(struct stack *stack,

  do {\

      if (p&0x80000000) {\

 	 uint32_t pg = p&0x7fffffff;\

+	 if (!pg) {\

+	 x = 0;\

+	 } else {\

 	 READNfrom(bc->numGlobalBytes, bc->globalBytes, x, n, pg);\

+	 }\

      } else {\

 	 READNfrom(func->numBytes, values, x, n, p);\

      }\

@@ -539,6 +542,8 @@ static inline int64_t ptr_register_glob_fixedid(struct ptr_infos *infos,

 static inline int64_t ptr_register_glob(struct ptr_infos *infos,

 					void *values, uint32_t size)

 {

+    if (!values)

+	return 0;

     return ptr_register_glob_fixedid(infos, values, size, infos->nglobs+1);

 }

@@ -876,7 +881,7 @@ int cli_vm_execute(const struct cli_bc *bc, struct cli_bc_ctx *ctx, const struct

 			int32_t resp;

 			READ32(arg2, inst->u.ops.ops[1]);

 			READP(arg1, inst->u.ops.ops[0], arg2);

-			READ32(arg3, inst->u.ops.ops[3]);

+			READ32(arg3, inst->u.ops.ops[2]);

 			resp = cli_apicalls9[api->idx](ctx, arg1, arg2, arg3);

 			WRITE32(inst->dest, resp);

 			break;