From b0b3fc2e9f0a316f476d896bb9d87e416d3f30da Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Mon, 29 Jan 2007 05:54:22 +0000
Subject: [PATCH] slightly faster 3m allocation for inexacts, rationals,
 complexes, and non-ASCII chars

svn: r5493
---
 src/mzscheme/gc2/gc2.h        | 1 +
 src/mzscheme/include/scheme.h | 4 ++++
 src/mzscheme/src/char.c       | 3 ++-
 src/mzscheme/src/complex.c    | 3 ++-
 src/mzscheme/src/number.c     | 5 +++--
 src/mzscheme/src/rational.c   | 3 ++-
 src/mzscheme/src/schpriv.h    | 6 ++++++
 7 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/src/mzscheme/gc2/gc2.h b/src/mzscheme/gc2/gc2.h
index 82b6d4e655..bb2e2c719b 100644
--- a/src/mzscheme/gc2/gc2.h
+++ b/src/mzscheme/gc2/gc2.h
@@ -165,6 +165,7 @@ GC2_EXTERN void *GC_malloc_atomic(size_t size_in_bytes);
    Alloc pointerless memory (not necessarily zeroed). */
 
 #define GC_malloc_atomic_tagged GC_malloc_one_tagged
+#define GC_malloc_small_atomic_tagged GC_malloc_one_small_dirty_tagged
 /*
    Alloc pointer-free tagged memory (not necessarily zeroed).
    MzScheme sets the tag before a collection. */
diff --git a/src/mzscheme/include/scheme.h b/src/mzscheme/include/scheme.h
index 02be6e126e..47019be22b 100644
--- a/src/mzscheme/include/scheme.h
+++ b/src/mzscheme/include/scheme.h
@@ -1504,6 +1504,8 @@ void *scheme_malloc(size_t size);
 # endif
 # define scheme_malloc_tagged GC_malloc_one_tagged
 # define scheme_malloc_small_tagged(s) GC_malloc_one_small_tagged(gcWORDS_TO_BYTES(gcBYTES_TO_WORDS(s)))
+# define scheme_malloc_small_dirty_tagged(s) GC_malloc_one_small_dirty_tagged(gcWORDS_TO_BYTES(gcBYTES_TO_WORDS(s)))
+# define scheme_malloc_small_atomic_tagged(s) GC_malloc_small_atomic_tagged(gcWORDS_TO_BYTES(gcBYTES_TO_WORDS(s)))
 # define scheme_malloc_array_tagged GC_malloc_array_tagged
 # define scheme_malloc_atomic_tagged GC_malloc_atomic_tagged
 # define scheme_malloc_stubborn_tagged GC_malloc_one_tagged
@@ -1533,7 +1535,9 @@ extern void *scheme_malloc_envunbox(size_t);
 #  define scheme_malloc_uncollectable_tagged scheme_malloc_uncollectable
 #  define scheme_malloc_envunbox scheme_malloc
 # endif
+# define scheme_malloc_small_dirty_tagged scheme_malloc_small_tagged
 # define scheme_malloc_allow_interior scheme_malloc
+# define scheme_malloc_small_atomic_tagged scheme_malloc_atomic_tagged
 #endif
 
 
diff --git a/src/mzscheme/src/char.c b/src/mzscheme/src/char.c
index 8e853450f2..23cbbff99d 100644
--- a/src/mzscheme/src/char.c
+++ b/src/mzscheme/src/char.c
@@ -258,7 +258,8 @@ Scheme_Object *scheme_make_char(mzchar ch)
   if (ch < 256)
     return scheme_char_constants[ch];
   
-  o = scheme_alloc_small_object();
+  o = scheme_malloc_small_atomic_tagged(sizeof(Scheme_Simple_Object));
+  CLEAR_KEY_FIELD(o);
   o->type = scheme_char_type;
   SCHEME_CHAR_VAL(o) = ch;
 
diff --git a/src/mzscheme/src/complex.c b/src/mzscheme/src/complex.c
index 825b5a3f10..2efa71722f 100644
--- a/src/mzscheme/src/complex.c
+++ b/src/mzscheme/src/complex.c
@@ -33,7 +33,8 @@ static Scheme_Object *make_complex(const Scheme_Object *r, const Scheme_Object *
 {
   Scheme_Complex *c;
 
-  c = MALLOC_ONE_TAGGED(Scheme_Complex);
+  c = (Scheme_Complex *)scheme_malloc_small_dirty_tagged(sizeof(Scheme_Complex));
+  CLEAR_KEY_FIELD(&c->so);
   c->so.type = scheme_complex_type;
   c->r = (Scheme_Object *)r;
   c->i = (Scheme_Object *)i;
diff --git a/src/mzscheme/src/number.c b/src/mzscheme/src/number.c
index 59a3cf4a4f..f016f4bfce 100644
--- a/src/mzscheme/src/number.c
+++ b/src/mzscheme/src/number.c
@@ -659,7 +659,7 @@ int scheme_is_nan(double d)
 
 Scheme_Object *scheme_make_double(double d)
 {
-  Scheme_Double *sd;
+  GC_CAN_IGNORE Scheme_Double *sd;
 
   if (d == 0.0) {
     if (minus_zero_p(d))
@@ -672,7 +672,8 @@ Scheme_Object *scheme_make_double(double d)
       return scheme_zerod;
   }
 
-  sd = (Scheme_Double *)scheme_malloc_atomic_tagged(sizeof(Scheme_Double));
+  sd = (Scheme_Double *)scheme_malloc_small_atomic_tagged(sizeof(Scheme_Double));
+  CLEAR_KEY_FIELD(&sd->so);
   sd->so.type = scheme_double_type;
   SCHEME_DBL_VAL(sd) = d;
   return (Scheme_Object *)sd;
diff --git a/src/mzscheme/src/rational.c b/src/mzscheme/src/rational.c
index 852852c0c7..06655dd861 100644
--- a/src/mzscheme/src/rational.c
+++ b/src/mzscheme/src/rational.c
@@ -33,8 +33,9 @@ static Scheme_Object *make_rational(const Scheme_Object *n, const Scheme_Object
 {
   Scheme_Rational *r;
 
-  r = MALLOC_ONE_TAGGED(Scheme_Rational);
+  r = (Scheme_Rational *)scheme_malloc_small_dirty_tagged(sizeof(Scheme_Rational));
   r->so.type = scheme_rational_type;
+  CLEAR_KEY_FIELD(&r->so);
   r->num = (Scheme_Object *)n;
   r->denom = (Scheme_Object *)d;
   
diff --git a/src/mzscheme/src/schpriv.h b/src/mzscheme/src/schpriv.h
index 8f8a2b55cc..66e226ce99 100644
--- a/src/mzscheme/src/schpriv.h
+++ b/src/mzscheme/src/schpriv.h
@@ -125,6 +125,12 @@ void scheme_clear_ephemerons(void);
 # define MZ_INLINE /* empty */
 #endif
 
+#ifdef MZ_PRECISE_GC
+# define CLEAR_KEY_FIELD(o) ((o)->keyex = 0)
+#else
+# define CLEAR_KEY_FIELD(o) /* empty */
+#endif
+
 /*========================================================================*/
 /*                             initialization                             */
 /*========================================================================*/