rerun test suite

1 files changed, 5 insertions, 10 deletions

diff --git a/asm/ffi.py b/asm/ffi.py
index e7903af..11c6f39 100644
--- a/asm/ffi.py
+++ b/asm/ffi.py
@@ -60,7 +60,7 @@ class Reader:
 
 class CEnv(Structure):
 	_fields_ = [
-		("dats", POINTER(POINTER(c_ubyte))),
+		("dats", POINTER(CReader)),
 		("datlen", c_size_t),
 		("reg", POINTER(c_uint)),
 		("reglen", c_size_t),
@@ -68,7 +68,8 @@ class CEnv(Structure):
 		("stkptr", c_size_t),
 		("stklen", c_size_t),
 		("r_current", CReader),
-		("r_start", CReader)
+		("r_start", CReader),
+		("fd", c_int)
 	]
 
 class RegisterOverflowError(Exception):
@@ -116,13 +117,7 @@ class Environment:
 	def getdat(self, n):
 		if n >= self.cenv.datlen or n < 0:
 			raise DataOverflowError(n)
-		rdr = CReader()
-		rdr.p = self.cenv.dats[n]
-		# Python does not allow for direct pointer arithmetic
-		rdr_p_v = addressof(rdr.p.contents)
-		r_start_p_v = addressof(self.cenv.r_start.p)
-
-		rdr.left = self.cenv.r_start.left - (rdr_p_v - r_start_p_v)
+		rdr = self.cenv.dats[n]
 
 		l = []
 		w = CWord()
@@ -143,7 +138,7 @@ class Environment:
 
 	def __init__(self, prog=None, reglen=32, datlen=32, stklen=4096, prglen=4096):
 		cenv = CEnv()
-		cenv.dats = (POINTER(c_ubyte) * datlen)()
+		cenv.dats = (CReader * datlen)()
 		cenv.datlen = datlen
 
 		cenv.reglen = reglen