about summary refs log tree commit diff
path: root/src/rt/rust_upcall.cpp
diff options
context:
space:
mode:
authorBrian Anderson <banderson@mozilla.com>2012-11-05 13:43:32 -0800
committerBrian Anderson <banderson@mozilla.com>2012-11-05 15:22:35 -0800
commit53ec6c3f9b495dd930cd061784251534bef58d74 (patch)
treeafd6830ae7e332be03c20e8cf0fb0894565a308f /src/rt/rust_upcall.cpp
parentbc3f89e92bfba43c193fbd928f1502209157431c (diff)
downloadrust-53ec6c3f9b495dd930cd061784251534bef58d74.tar.gz
rust-53ec6c3f9b495dd930cd061784251534bef58d74.zip
rt: Remove shape code
Diffstat (limited to 'src/rt/rust_upcall.cpp')
-rw-r--r--src/rt/rust_upcall.cpp54
1 files changed, 4 insertions, 50 deletions
diff --git a/src/rt/rust_upcall.cpp b/src/rt/rust_upcall.cpp
index afb62d52be7..0a9f0647789 100644
--- a/src/rt/rust_upcall.cpp
+++ b/src/rt/rust_upcall.cpp
@@ -301,12 +301,8 @@ rust_upcall_free(void* ptr) {
 
 extern "C" CDECL void
 upcall_validate_box(rust_opaque_box* ptr) {
-    if (ptr) {
-        assert(ptr->ref_count > 0);
-        assert(ptr->td != NULL);
-        assert(ptr->td->align <= 8);
-        assert(ptr->td->size <= 4096); // might not really be true...
-    }
+    // XXX: Remove after snapshot
+    abort();
 }
 
 /**********************************************************************/
@@ -366,51 +362,9 @@ upcall_rust_personality(int version,
 }
 
 extern "C" void
-shape_cmp_type(int8_t *result, const type_desc *tydesc,
-               uint8_t *data_0, uint8_t *data_1, uint8_t cmp_type);
-
-struct s_cmp_type_args {
-    int8_t *result;
-    const type_desc *tydesc;
-    uint8_t *data_0;
-    uint8_t *data_1;
-    uint8_t cmp_type;
-};
-
-extern "C" void
-upcall_s_cmp_type(s_cmp_type_args *args) {
-    shape_cmp_type(args->result, args->tydesc,
-                   args->data_0, args->data_1, args->cmp_type);
-}
-
-extern "C" void
-upcall_cmp_type(int8_t *result, const type_desc *tydesc,
-                uint8_t *data_0, uint8_t *data_1, uint8_t cmp_type) {
-    rust_task *task = rust_get_current_task();
-    s_cmp_type_args args = {result, tydesc,
-                            data_0, data_1, cmp_type};
-    UPCALL_SWITCH_STACK(task, &args, upcall_s_cmp_type);
-}
-
-extern "C" void
-shape_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level);
-
-struct s_log_type_args {
-    const type_desc *tydesc;
-    uint8_t *data;
-    uint32_t level;
-};
-
-extern "C" void
-upcall_s_log_type(s_log_type_args *args) {
-    shape_log_type(args->tydesc, args->data, args->level);
-}
-
-extern "C" void
 upcall_log_type(const type_desc *tydesc, uint8_t *data, uint32_t level) {
-    rust_task *task = rust_get_current_task();
-    s_log_type_args args = {tydesc, data, level};
-    UPCALL_SWITCH_STACK(task, &args, upcall_s_log_type);
+    // XXX: Remove after snapshot
+    abort();
 }
 
 // NB: This needs to be blazing fast. Don't switch stacks