removing the index field from types

Author: deyaaeldeen

src/backend-c/generate-c.rkt

@@ -163,7 +163,7 @@
 (: emit-var-declarations (-> (Listof Uid) Void))
 (define (emit-var-declarations d*)
   (display "\n//These are the variable declarations\n")
-  (display "\ntable types_ht;\nint64_t types_unique_index_counter;\n")
+  (display "\ntable types_ht;\n")
   (display "\ncast_queue* mref_cast_q;\ncast_queue* mvect_cast_q;\n")
   (display cast-profiler/external-c-decl*)
   (display-seq (map uid->string d*) "" (string-append IMDT-C-TYPE " ") "" ";\n" ""))
@@ -179,8 +179,7 @@
 (: initialize-types-table (-> Void))
 (define (initialize-types-table)
   (printf "types_ht = alloc_hash_table(~a, ~a);\n"
-          (init-types-hash-table-slots) (types-hash-table-load-factor))
-  (display "types_unique_index_counter = 0;"))
+          (init-types-hash-table-slots) (types-hash-table-load-factor)))
 
 (: initialize-suspended-cast-queues (-> Void))
 (define (initialize-suspended-cast-queues)
@@ -650,10 +649,6 @@
      (display ",")
      (emit-value hcode)
      (display ")")]
-    [('Types-gen-index! (list))
-     (display "types_unique_index_counter++")]
-    [('get-types-hashcons-index (list))
-     (display "types_unique_index_counter")]
     [('mref-cast-queue-enqueue (list addr ty))
      (display "cast_queue_enqueue(mref_cast_q,")
      (emit-value addr)

src/backend-c/runtime/runtime.h

@@ -22,7 +22,6 @@
 #include "suspended_cast.h"
 
 extern table types_ht;
-extern int64_t types_unique_index_counter;
 extern cast_queue* mref_cast_q;
 extern cast_queue* mvect_cast_q;
 

src/casts/constants-and-codes.rkt

@@ -44,8 +44,7 @@
   (TYPE-FLOAT-RT-VALUE      #b100111)
   (TYPE-CHAR-RT-VALUE       #b101111)
   (TYPE-MAX-ATOMIC-RT-VALUE #b111111)
-  (TYPE-HASHCONS-INDEX-INDEX    0)
-  (TYPE-HASHCONS-HASHCODE-INDEX 1)
+  (TYPE-HASHCONS-HASHCODE-INDEX 0)
 
   (HC-PRJ-TAG-MASK  #b10)
   (HC-INJ-TAG-MASK  #b01)
@@ -229,8 +228,6 @@
        (format-id stx "~a-~a?" namespace-string name-string))
      (define/with-syntax namespace-mask-def
        (format-id stx "~a-TAG-MASK" namespace-string-caps))
-     (define/with-syntax index-def
-       (format-id stx "~a-INDEX-INDEX" qualified-upcase-name))
      (define/with-syntax hash-def
        (format-id stx "~a-HASH-INDEX" qualified-upcase-name))
      (define/with-syntax tag-def (format-id stx "~a-TAG" qualified-upcase-name))
@@ -259,8 +256,7 @@
                    [else
                     #`(sr-alloc
                        #,name-string tag-def
-                       `(("index"    . ,(Quote 0))
-                        ("hashcode" . ,(Quote 0))
+                       `(("hashcode" . ,(Quote 0))
                         (field* . ,alloc-val*) ...))]))))
      (define/with-syntax equal-arg (generate-temporary))
      (define (gen-func-access*)
@@ -309,8 +305,7 @@
      #`(begin
          (define-constants
            (tag-def tag)
-           (index-def 0)
-           (hash-def 1)
+           (hash-def 0)
            (sindex/offset-def* sindex/offset-val*) ...)
          func-alloc
          (define (func-huh-name equal-arg)
@@ -401,11 +396,7 @@
              ;; one for the index in the hashconsing table and one for the
              ;; hashcode.
              (when$ (op$ = ty hty)
-                    (assign$ index (op$ get-types-hashcons-index))
-                    (assign$ _unused (op$ Types-gen-index!))
                     (assign$ tag (sr-get-tag ty TYPE-TAG-MASK))
-                    (sr-tagged-array-set!
-                     hty tag TYPE-HASHCONS-INDEX-INDEX index)
                     (sr-tagged-array-set!
                      hty tag TYPE-HASHCONS-HASHCODE-INDEX hcode))
              hty)])))