@@ -59,9 +59,18 @@ uint32_t cli_bcapi_test2(struct cli_bc_ctx *ctx, uint32_t a)

 int32_t cli_bcapi_read(struct cli_bc_ctx* ctx, uint8_t *data, int32_t size)

 {

+    int n;

     if (!ctx->fmap)

 	return -1;

-    return fmap_readn(ctx->fmap, data, ctx->off, size);

+    if (size < 0) {

+	cli_errmsg("bytecode: negative read size: %d\n", size);

+	return -1;

+    }

+    n = fmap_readn(ctx->fmap, data, ctx->off, size);

+    if (n <= 0)

+	return n;

+    ctx->off += n;

+    return n;

 }

 int32_t cli_bcapi_seek(struct cli_bc_ctx* ctx, int32_t pos, uint32_t whence)

@@ -81,7 +81,7 @@ uint32_t test1(uint32_t, uint32_t);

 /**

  * @brief Reads specified amount of bytes from the current file

- * into a buffer.

+ * into a buffer. Also moves current position in the file.

  *

  * @param[in] size amount of bytes to read

  * @param[out] data pointer to buffer where data is read into

@@ -182,6 +182,9 @@ static void* noUnknownFunctions(const std::string& name) {

 	.Case("__ashrdi3", (void*)(intptr_t)rtlib_sra_i64)

 	.Case("__ashldi3", (void*)(intptr_t)rtlib_shl_i64)

 	.Case("__lshrdi3", (void*)(intptr_t)rtlib_srl_i64)

+	.Case("memmove", (void*)(intptr_t)memmove)

+	.Case("memcpy", (void*)(intptr_t)memcpy)

+	.Case("memset", (void*)(intptr_t)memset)

 	.Default(0);

     if (addr)

 	return addr;

@@ -1132,7 +1135,17 @@ public:

 				Store(inst->dest, C);

 				break;

 			    }

-

+			case OP_BC_PTRDIFF32:

+			    {

+				Value *P1 = convertOperand(func, inst, inst->u.binop[0]);

+				Value *P2 = convertOperand(func, inst, inst->u.binop[1]);

+				P1 = Builder.CreatePtrToInt(P1, Type::getInt64Ty(Context));

+				P2 = Builder.CreatePtrToInt(P2, Type::getInt64Ty(Context));

+				Value *R = Builder.CreateSub(P1, P2);

+				R = Builder.CreateTrunc(R, Type::getInt32Ty(Context));

+				Store(inst->dest, R);

+				break;

+			    }

 			default:

 			    errs() << MODULE << "JIT doesn't implement opcode " <<

 				inst->opcode << " yet!\n";

@@ -83,6 +83,7 @@ enum bc_opcode {

   OP_BC_BSWAP16,

   OP_BC_BSWAP32,

   OP_BC_BSWAP64,

+  OP_BC_PTRDIFF32,

   OP_BC_INVALID /* last */

 };

@@ -108,8 +109,8 @@ static const unsigned char operand_counts[] = {

   3, 3, 3, 3,

   /* OP_BC_ISBIGENDIAN */

   0,

-  /* OP_BC_ABORT, OP_BSWAP* */

-  0, 1, 1, 1

+  /* OP_BC_ABORT, OP_BSWAP*, OP_PTRDIFF32 */

+  0, 1, 1, 1, 2

 };

 enum bc_global {