Add BCODE_PTR macro and drop uing DATAPTR in eval.c.

git-svn-id: https://svn.r-project.org/R/trunk@89008 00db46b3-68df-0310-9c12-caf00c1e9a41

Author: luke

src/include/Defn.h

@@ -664,6 +664,7 @@ void (SET_HASHVALUE)(SEXP x, int v);
 
 /* Bytecode access macros */
 #define BCODE_CODE(x)	CAR(x)
+#define BCODE_PTR(x) ((BCODE *) DATAPTR(x))
 //#define BCODE_CONSTS(x) CDR(x)
 #define BCODE_EXPR(x)	TAG(x)
 #define isByteCode(x)	(TYPEOF(x)==BCODESXP)

src/main/eval.c

@@ -5606,7 +5606,7 @@ static struct { void *addr; int argc; char *instname; } opinfo[OPCOUNT];
 #define GETOP() (*pc++).i
 #define SKIP_OP() (pc++)
 
-#define BCCODE(e) (BCODE *) DATAPTR(BCODE_CODE(e))
+#define BCCODE(e) BCODE_PTR(BCODE_CODE(e))
 #else
 typedef int BCODE;
 
@@ -8718,15 +8718,15 @@ attribute_hidden SEXP R_bcEncode(SEXP bytes)
     v = ipc[0];
     if (v < R_bcMinVersion || v > R_bcVersion) {
 	code = allocVector(INTSXP, m * 2);
-	pc = (BCODE *) DATAPTR(code);
+	pc = BCODE_PTR(code);
 	pc[0].i = v;
 	pc[1].v = opinfo[BCMISMATCH_OP].addr;
 	return code;
     }
     else {
 	code = allocVector(INTSXP, m * n);
 	memset(INTEGER(code), 0, m * n * sizeof(int));
-	pc = (BCODE *) DATAPTR(code);
+	pc = BCODE_PTR(code);
 
 	for (i = 0; i < n; i++) pc[i].i = ipc[i];
 
@@ -8771,7 +8771,7 @@ attribute_hidden SEXP R_bcDecode(SEXP code) {
     int m = (sizeof(BCODE) + sizeof(int) - 1) / sizeof(int);
 
     n = LENGTH(code) / m;
-    pc = (BCODE *) DATAPTR(code);
+    pc = BCODE_PTR(code);
 
     bytes = allocVector(INTSXP, n);
     ipc = INTEGER(bytes);