Merge pull request #129 from undingen/sha_modules2

Add the sha256 and sha512 modules 

include/pyport.h

@@ -13,6 +13,9 @@
 typedef ssize_t         Py_ssize_t;
 #define Py_FORMAT_PARSETUPLE(func,p1,p2)
 #define Py_GCC_ATTRIBUTE(x) __attribute__(x)
+#define HAVE_LONG_LONG 1
+#define PY_LONG_LONG long long
+
 
 
 // Pyston change: the rest of these have just been copied from CPython's pyport.h, in an arbitrary order:
@@ -126,6 +129,13 @@ typedef ssize_t         Py_ssize_t;
 #define Py_SAFE_DOWNCAST(VALUE, WIDE, NARROW) (NARROW)(VALUE)
 #endif
 
+#ifndef Py_LL
+#define Py_LL(x) x##LL
+#endif
+
+#ifndef Py_ULL
+#define Py_ULL(x) Py_LL(x##U)
+#endif
 
 #endif /* Py_PYPORT_H */
 

src/Makefile

@@ -268,7 +268,7 @@ SRCS := $(MAIN_SRCS) $(STDLIB_SRCS)
 STDLIB_OBJS := stdlib.bc.o stdlib.stripped.bc.o
 STDLIB_RELEASE_OBJS := stdlib.release.bc.o
 
-STDMODULE_SRCS := errnomodule.c shamodule.c md5.c md5module.c $(EXTRA_STDMODULE_SRCS)
+STDMODULE_SRCS := errnomodule.c shamodule.c sha256module.c sha512module.c md5.c md5module.c $(EXTRA_STDMODULE_SRCS)
 STDMODULE_SRCS := $(addprefix ../lib_python/2.7_Modules/,$(STDMODULE_SRCS))
 
 # The stdlib objects have slightly longer dependency chains,

src/runtime/capi.cpp

@@ -225,7 +225,6 @@ extern "C" int PyType_Ready(PyTypeObject* cls) {
     RELEASE_ASSERT(cls->tp_weaklistoffset == 0, "");
     RELEASE_ASSERT(cls->tp_iter == NULL, "");
     RELEASE_ASSERT(cls->tp_iternext == NULL, "");
-    RELEASE_ASSERT(cls->tp_members == NULL, "");
     RELEASE_ASSERT(cls->tp_base == NULL, "");
     RELEASE_ASSERT(cls->tp_dict == NULL, "");
     RELEASE_ASSERT(cls->tp_descr_get == NULL, "");
@@ -254,13 +253,13 @@ extern "C" int PyType_Ready(PyTypeObject* cls) {
     // tp_basicsize, tp_itemsize
     // tp_doc
 
-    if (cls->tp_methods) {
-        PyMethodDef* method = cls->tp_methods;
-        while (method->ml_name) {
-            auto desc = new BoxedMethodDescriptor(method);
-            cls->giveAttr(method->ml_name, desc);
-            method++;
-        }
+
+    for (PyMethodDef* method = cls->tp_methods; method && method->ml_name; ++method) {
+        cls->giveAttr(method->ml_name, new BoxedMethodDescriptor(method));
+    }
+
+    for (PyMemberDef* member = cls->tp_members; member && member->name; ++member) {
+        cls->giveAttr(member->name, new BoxedMemberDescriptor(member));
     }
 
     if (cls->tp_getset) {

src/runtime/objmodel.cpp

@@ -695,6 +695,10 @@ static Box* _handleClsAttr(Box* obj, Box* attr) {
                 bool rtn = reinterpret_cast<bool*>(obj)[member_desc->offset];
                 return boxBool(rtn);
             }
+            case BoxedMemberDescriptor::INT: {
+                int rtn = reinterpret_cast<int*>(obj)[member_desc->offset/sizeof(int)];
+                return boxInt(rtn);
+            }
             default:
                 RELEASE_ASSERT(0, "%d", member_desc->type);
         }

src/runtime/types.cpp

@@ -33,6 +33,8 @@
 
 extern "C" void initerrno();
 extern "C" void init_sha();
+extern "C" void init_sha256();
+extern "C" void init_sha512();
 extern "C" void init_md5();
 
 namespace pyston {
@@ -181,7 +183,7 @@ extern "C" void boxGCHandler(GCVisitor* v, Box* b) {
                 HCAttrs::AttrList* attr_list = attrs->attr_list;
                 assert(attr_list);
                 v->visit(attr_list);
-                v->visitRange((void**)&attr_list->attrs[0], (void**)&attr_list->attrs[nattrs]);
+                v->visitPotentialRange((void**)&attr_list->attrs[0], (void**)&attr_list->attrs[nattrs]);
             }
         }
     } else {
@@ -734,7 +736,9 @@ void setupRuntime() {
 
     initerrno();
     init_sha();
-    // init_md5();
+    init_sha256();
+    init_sha512();
+    init_md5();
 
     setupSysEnd();
 

src/runtime/types.h

@@ -324,12 +324,14 @@ public:
     enum MemberType {
         BOOL = T_BOOL,
         BYTE = T_BYTE,
+        INT = T_INT,
         OBJECT = T_OBJECT,
     } type;
 
     int offset;
 
     BoxedMemberDescriptor(MemberType type, int offset) : Box(member_cls), type(type), offset(offset) {}
+    BoxedMemberDescriptor(PyMemberDef* member) : Box(member_cls), type((MemberType)member->type), offset(member->offset) {}
 };
 
 // TODO is there any particular reason to make this a Box, ie a python-level object?

test/tests/hashlib_test.py

+# expected: fail
+# - warnings about PyString_AsString(), since that is allowed to be modified
+import hashlib
+
+#for m in [hashlib.md5(), hashlib.sha1(), hashlib.sha256(), hashlib.sha512()]:
+for m in [hashlib.sha256(), hashlib.sha512()]:
+ m.update("pyston")
+ print m.digest_size, m.hexdigest()