X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=bytecode.h;h=92c124dc0619033ccb4888a357406ecb0de32a62;hb=ac4c12e7aee90d31d5da776601addbfd9d738a5a;hp=4676b5ad601ac19af0fb4063e9e715de432a461b;hpb=f7d144c835d02593edb2388cf7cb0c7395c53ae2;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/bytecode.h b/bytecode.h
index 4676b5a..92c124d 100644
--- a/bytecode.h
+++ b/bytecode.h
@@ -23,7 +23,7 @@ EXT I32 obj_list_fill INIT(-1);
 	 bs.fread((char*)(argp),(len),(nelem),bs.data)
 #define BGET_FGETC() bs.fgetc(bs.data)
 #else
-#define BGET_FREAD(argp, len, nelem) PerlIO_fread((argp), (len), (nelem), fp)
+#define BGET_FREAD(argp, len, nelem) PerlIO_read(fp, (argp), (len)*(nelem))
 #define BGET_FGETC() PerlIO_getc(fp)
 #endif /* INDIRECT_BGET_MACROS */
 
@@ -51,7 +51,7 @@ EXT I32 obj_list_fill INIT(-1);
 	BGET_U32(arg);				\
 	if (arg) {				\
 	    New(666, pv.xpv_pv, arg, char);	\
-	    PerlIO_fread(pv.xpv_pv, 1, arg, fp);\
+	    PerlIO_read(fp, pv.xpv_pv, arg);	\
 	    pv.xpv_len = arg;			\
 	    pv.xpv_cur = arg - 1;		\
 	} else {				\
@@ -108,11 +108,13 @@ EXT I32 obj_list_fill INIT(-1);
 	arg = atof(str);		\
     } STMT_END
 
-#define BGET_objindex(arg) STMT_START {	\
-	U32 ix;				\
-	BGET_U32(ix);			\
-	arg = obj_list[ix];		\
+#define BGET_objindex(arg, type) STMT_START {	\
+	U32 ix;					\
+	BGET_U32(ix);				\
+	arg = (type)obj_list[ix];		\
     } STMT_END
+#define BGET_svindex(arg) BGET_objindex(arg, svindex)
+#define BGET_opindex(arg) BGET_objindex(arg, opindex)
 
 #define BSET_ldspecsv(sv, arg) sv = specialsv_list[arg]