Changeset 290

Timestamp:

Dec 20, 2002, 10:17:35 PM (18 years ago)

Author:

orlov

Message:

* empty log message *

Location:

to-imperative/branches/may_move_heap/runtime

Files:

• pxx_common.hh (modified) (1 diff)
• pxx_heap_allocator.hh (modified) (1 diff)
• rf_expr.hh (modified) (1 diff)
• rf_macros.hh (modified) (1 diff)
• rf_term.hh (modified) (1 diff)

to-imperative/branches/may_move_heap/runtime/pxx_common.hh

@@ -21 +21 @@
 #endif
 
-#define MAY_MOVE_HEAP 1
-#define HEAP_IS_ALIGNED 0
+#define MAY_MOVE_HEAP 0
+#define HEAP_IS_ALIGNED 1
 
 #define null (0)

to-imperative/branches/may_move_heap/runtime/pxx_heap_allocator.hh

@@ -253 +253 @@
   {
     MemoryBlock *q = ptr_add( this, offset );
-    size_t size = q->size;
-    if( size & (size - 1) )
+    size_t sz = q->size;
+    if( sz & (sz - 1) )
     {
-      size = rounds[((T*)q)->get_order()];
-      printf( "a(%p):%u ", q, size );
+      sz = rounds[((T*)q)->get_order()];
+      printf( "a(%p):%u ", q, sz );
     }
     else
     {
-      printf( "f(%p):%u ", q, size );
+      printf( "f(%p):%u ", q, sz );
     }
-    if( !size )
+    if( !sz )
     {
       printf( "...block orders are corrupted..." );
       break;
     }
-    offset += size;
+    offset += sz;
   }
   printf( "\n\n" );

to-imperative/branches/may_move_heap/runtime/rf_expr.hh

@@ -697 +697 @@
 
 friend
-inline bool fast_eq (
-  Term_Ptr _f1, Term_Ptr _l1, Term_Ptr _f2, Term_Ptr _l2
+inline bool eq_expr (
+  const Expr &_e1, uintptr_t _pos1, uintptr_t _len1,
+  const Expr &_e2, uintptr_t _pos2, uintptr_t _len2
 )
 {
-  for (; _f1 < _l1; _f1++, _f2++) {
-    if (_f1->get_type() != _f2->get_type() || _f1->data2 != _f2->data2)
+  if (_len1 == _len2) {
+    Term_Ptr p1 = _e1.get_first() + _pos1;
+    Term_Ptr p2 = _e2.get_first() + _pos2;
+    Term_Ptr l1 = p1  + _len1;
+    for (; p1 < l1; p1++, p2++) {
+      if (*p1 != *p2) return false;
+    }
+    return true;
+  }
+  return false;
+}
+
+friend
+inline bool flat_eq (
+  const Expr &_e1, uintptr_t _pos1,
+  const Expr &_e2, uintptr_t _pos2, uintptr_t _len
+)
+{
+  Term_Ptr p1 = _e1.get_first() + _pos1;
+  Term_Ptr p2 = _e2.get_first() + _pos2;
+  Term_Ptr l1 = p1  + _len;
+  for (; p1 < l1; p1++, p2++) {
+    if (p1->get_type() != p2->get_type() || p1->data2 != p2->data2)
       return false;
   }

to-imperative/branches/may_move_heap/runtime/rf_macros.hh

@@ -74 +74 @@
   return __saved_top
 
+#define RF_DECL(f) \
+  extern "C" RetVal rf_##f (void)
+
 #define func_decl(f) \
   extern "C" RetVal rf_##f ()

to-imperative/branches/may_move_heap/runtime/rf_term.hh

@@ -68 +68 @@
 friend inline Expr operator + (Term const&, Term const&) ;
 friend inline bool operator == (Term const&, Term const&) ;
-friend inline bool fast_eq (
-                Term_Ptr _f1, Term_Ptr _l1, Term_Ptr _f2, Term_Ptr _l2) ;
+friend inline bool flat_eq (
+    const Expr &_e1, uintptr_t _pos1,
+    const Expr &_e2, uintptr_t _pos2, uintptr_t _len );
 
 private: