Add more methods, more tests passes

libs/cturmit.c

@@ -195,8 +195,33 @@ but %ld found", sz);
 	Py_RETURN_NONE;
 }
 
+PyObject* CTurmit__pop(CTurmit* self)
+{
+	return PyLong_FromUnsignedLongLong(SPOP(self->turmit));
+}
+
+PyObject* CTurmit_get_shead(CTurmit *self, void *ref)
+{
+	return PyLong_FromUnsignedLongLong(SCUR(self->turmit));
+}
+
 PyObject* CTurmit_get__cur(CTurmit *self, void *ref)
 {
 	return PyLong_FromSsize_t(self->turmit->stack_cur);
 }
 
+PyObject* CTurmit_get__stack(CTurmit *self, void *ref)
+{
+	size_t i;
+	PyObject *res;
+
+	res = PyList_New(self->turmit->stack_sz);
+
+	for(i=0; i<self->turmit->stack_sz;i++)
+	{
+		PyList_SET_ITEM(res, i,
+			PyLong_FromUnsignedLongLong(self->turmit->stack[i]));
+	}
+	return res;
+}
+

libs/cturmit.h

@@ -50,19 +50,56 @@ static PyMappingMethods CTurmit_asmapping[] = {{
 	METH_NOARGS, NULL}
 
 PyObject* CTurmit__push(CTurmit* self, PyObject *args);
+PyObject* CTurmit__pop(CTurmit* self);
+TURMIT_PYOP(mem_sz)
 TURMIT_PYOP(add)
+TURMIT_PYOP(sub)
+TURMIT_PYOP(bin_and)
+TURMIT_PYOP(dup)
+TURMIT_PYOP(lshift)
+TURMIT_PYOP(mod)
+TURMIT_PYOP(mul)
+TURMIT_PYOP(div)
+TURMIT_PYOP(bin_or)
+TURMIT_PYOP(bin_xor)
+TURMIT_PYOP(pop)
+TURMIT_PYOP(swp)
+TURMIT_PYOP(jmp)
+TURMIT_PYOP(jz)
+TURMIT_PYOP(jcmp)
 
 static PyMethodDef CTurmit_methods[] = {
 	{"_push", (PyCFunction)CTurmit__push, METH_KEYWORDS | METH_VARARGS,
 		"Push a value on the stack"},
+	{"_pop", (PyCFunction)CTurmit__pop, METH_NOARGS,
+		"Pop a value from the stack"},
+	TURMIT_PYOPDEF(mem_sz),
 	TURMIT_PYOPDEF(add),
+	TURMIT_PYOPDEF(sub),
+	TURMIT_PYOPDEF(bin_and),
+	TURMIT_PYOPDEF(dup),
+	TURMIT_PYOPDEF(lshift),
+	TURMIT_PYOPDEF(mod),
+	TURMIT_PYOPDEF(mul),
+	TURMIT_PYOPDEF(div),
+	TURMIT_PYOPDEF(bin_or),
+	TURMIT_PYOPDEF(bin_xor),
+	TURMIT_PYOPDEF(pop),
+	TURMIT_PYOPDEF(swp),
+	TURMIT_PYOPDEF(jmp),
+	TURMIT_PYOPDEF(jz),
+	TURMIT_PYOPDEF(jcmp),
 	{NULL}  /* Sentinel */
 };
 
+PyObject* CTurmit_get_shead(CTurmit *self, void *ref);
 PyObject* CTurmit_get__cur(CTurmit *self, void *ref);
+PyObject* CTurmit_get__stack(CTurmit *self, void *ref);
 
 static struct PyGetSetDef CTurmit_getset[] = {
+	{"shead", (getter)CTurmit_get_shead, NULL, NULL, NULL},
 	{"_cur", (getter)CTurmit_get__cur, NULL, NULL, NULL},
+	{"_stack", (getter)CTurmit_get__stack, NULL, NULL, NULL},
 	{NULL}  /* Sentinel */
 };
 

libs/setup.py

@@ -1,7 +1,7 @@
 from distutils.core import setup, Extension
 
 module1 = Extension('cturmit',
-    sources = ['cturmit.c'])
+    sources = ['cturmit.c', 'turmit.c'])
 
 
 setup(

libs/turmit.c

@@ -12,6 +12,8 @@ TURMIT_OP(mem_sz)
 	new = realloc(turmit->stack, sizeof(turmit_int) * new_sz);
 	if(!new) { return; }
 	turmit->stack = new;
+	turmit->stack_sz = new_sz;
+	turmit->stack_cur %= new_sz;
 	if(old_sz < new_sz)
 	{
 		bzero(turmit->stack + old_sz, new_sz - old_sz);
@@ -20,17 +22,20 @@ TURMIT_OP(mem_sz)
 
 TURMIT_OP(add)
 {
-	SPUSH(turmit, SPOP(turmit) + SPOP(turmit));
+	turmit_int a = SPOP(turmit), b = SPOP(turmit);
+	SPUSH(turmit, a+b);
 }
 
 TURMIT_OP(sub)
 {
-	SPUSH(turmit, SPOP(turmit) - SPOP(turmit));
+	turmit_int a = SPOP(turmit), b = SPOP(turmit);
+	SPUSH(turmit, b - a);
 }
 
 TURMIT_OP(bin_and)
 {
-	SPUSH(turmit, SPOP(turmit) & SPOP(turmit));
+	turmit_int a = SPOP(turmit), b = SPOP(turmit);
+	SPUSH(turmit, b & a);
 }
 
 TURMIT_OP(dup)
@@ -55,7 +60,8 @@ TURMIT_OP(mod)
 
 TURMIT_OP(mul)
 {
-	SPUSH(turmit, SPOP(turmit) * SPOP(turmit));
+	turmit_int a = SPOP(turmit), b = SPOP(turmit);
+	SPUSH(turmit, a*b);
 }
 
 TURMIT_OP(div)
@@ -68,12 +74,14 @@ TURMIT_OP(div)
 
 TURMIT_OP(bin_or)
 {
-	SPUSH(turmit, SPOP(turmit) | SPOP(turmit));
+	turmit_int a = SPOP(turmit), b = SPOP(turmit);
+	SPUSH(turmit, a | b);
 }
 
 TURMIT_OP(bin_xor)
 {
-	SPUSH(turmit, SPOP(turmit) ^ SPOP(turmit));
+	turmit_int a = SPOP(turmit), b = SPOP(turmit);
+	SPUSH(turmit, a ^ b);
 }
 
 TURMIT_OP(pop)