bytecode v5 reader ok

src/code.c

@@ -426,6 +426,7 @@ hl_code *hl_code_read( const unsigned char *data, int size ) {
 	hl_alloc alloc;
 	int i;
 	int flags;
+	int max_version = 5;
 	hl_alloc_init(&alloc);
 	c = hl_zalloc(&alloc,sizeof(hl_code));
 	c->alloc = alloc;
@@ -434,14 +435,16 @@ hl_code *hl_code_read( const unsigned char *data, int size ) {
 		EXIT("Invalid header");
 	r->code = c;
 	c->version = READ();
-	if( c->version <= 1 || c->version > 4 ) {
-		printf("VER=%d\n",c->version);
+	if( c->version <= 1 || c->version > max_version ) {
+		printf("Found version %d while HL %d.%d supports up to %d\n",c->version,HL_VERSION>>8,(HL_VERSION>>4)&15,max_version);
 		EXIT("Unsupported bytecode version");
 	}
 	flags = UINDEX();
 	c->nints = UINDEX();
 	c->nfloats = UINDEX();
 	c->nstrings = UINDEX();
+	if( c->version >= 5 ) 
+		c->nbytes = UINDEX();
 	c->ntypes = UINDEX();
 	c->nglobals = UINDEX();
 	c->nnatives = UINDEX();
@@ -461,6 +464,16 @@ hl_code *hl_code_read( const unsigned char *data, int size ) {
 	c->strings = hl_read_strings(r, c->nstrings, &c->strings_lens);
 	ALLOC(c->ustrings,uchar*,c->nstrings);
 	CHK_ERROR();
+	if( c->version >= 5 ) {
+		int size = hl_read_i32(r);
+		c->bytes = hl_malloc(&c->alloc,size);
+		hl_read_bytes(r,c->bytes,size);
+		ALLOC(c->bytes_pos,int,c->nbytes);
+		CHK_ERROR();
+		for(i=0;i<c->nbytes;i++)
+			c->bytes_pos[i] = UINDEX();
+		CHK_ERROR();
+	}
 	if( c->hasdebug ) {
 		c->ndebugfiles = UINDEX();
 		c->debugfiles = hl_read_strings(r, c->ndebugfiles, &c->debugfiles_lens);

src/hl.h

@@ -27,7 +27,7 @@
 	https://github.com/HaxeFoundation/hashlink/wiki/
 **/
 
-#define HL_VERSION	0x180
+#define HL_VERSION	0x190
 
 #if defined(_WIN32)
 #	define HL_WIN

src/hlmodule.h

@@ -61,6 +61,7 @@ typedef struct {
 	int nints;
 	int nfloats;
 	int nstrings;
+	int nbytes;
 	int ntypes;
 	int nglobals;
 	int nnatives;
@@ -73,6 +74,8 @@ typedef struct {
 	double*		floats;
 	char**		strings;
 	int*		strings_lens;
+	char*		bytes;
+	int*		bytes_pos;
 	char**		debugfiles;
 	int*		debugfiles_lens;
 	uchar**		ustrings;

src/jit.c

@@ -3088,8 +3088,11 @@ int hl_jit_function( jit_ctx *ctx, hl_module *m, hl_function *f ) {
 			store(ctx,dst,dst->current,false);
 			break;
 		case OBytes:
-			op64(ctx,MOV,alloc_cpu(ctx,dst,false),pconst64(&p,(int_val)m->code->strings[o->p2]));
-			store(ctx,dst,dst->current,false);
+			{
+				char *b = m->code->version >= 5 ? m->code->bytes + m->code->bytes_pos[o->p2] : m->code->strings[o->p2];
+				op64(ctx,MOV,alloc_cpu(ctx,dst,false),pconst64(&p,(int_val)b));
+				store(ctx,dst,dst->current,false);
+			}
 			break;
 		case ONull:
 			{