From 79d490292f582ce8946ddaa48d2c44cffc502026 Mon Sep 17 00:00:00 2001
From: Justin Ethier <justin.ethier@gmail.com>
Date: Thu, 14 Jun 2018 18:09:43 -0400
Subject: [PATCH] Revert changes for now

---
 include/cyclone/types.h | 14 ++++----------
 test-fixnum-packing.c   | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/include/cyclone/types.h b/include/cyclone/types.h
index ee04e832..a728db86 100644
--- a/include/cyclone/types.h
+++ b/include/cyclone/types.h
@@ -493,20 +493,14 @@ typedef uint32_t char_type;
 /**
  * Convert from an object to an integer.
  */
-#ifdef __clang__
-  #define obj_obj2int(n)   (((long)((ulong)(n) & ~1))/(long)(1uL<<1))
-#else
-  #define obj_obj2int(x) ((long)(x)>>1)
-#endif
+//#define obj_obj2int(n)   (((long)((ulong)(n) & ~1))/(long)(1uL<<1))
+#define obj_obj2int(x) ((long)(x)>>1)
 
 /**
  * Convert from an integer to an object.
  */
-#ifdef __clang__
-  #define obj_int2obj(n)    ((void *) ((((long)(n))*(long)(1uL<<1)) | 1))
-#else
-  #define obj_int2obj(c) ((void *)((((long)c)<<1) | 1))
-#endif
+//#define obj_int2obj(n) ((void *) ((((long)(n))*(long)(1uL<<1)) | 1))
+#define obj_int2obj(c) ((void *)((((long)c)<<1) | 1))
 
 /**
  * Determine if the object is a char.
diff --git a/test-fixnum-packing.c b/test-fixnum-packing.c
index af7aabb5..b5f287c0 100644
--- a/test-fixnum-packing.c
+++ b/test-fixnum-packing.c
@@ -5,15 +5,17 @@
 ///**
 // * Convert from an object to an integer.
 // */
-#define my_obj_obj2int(x) ((long)(x)>>1)
+//#define my_obj_obj2int(x) ((long)(x)>>1)
 //
-//+#define sexp_make_fixnum(n)    ((sexp) ((((sexp_sint_t)(n))*(sexp_sint_t)(1uL<<SEXP_FIXNUM_BITS)) | SEXP_FIXNUM_TAG))
 //+#define sexp_unbox_fixnum(n)   (((sexp_sint_t)((sexp_uint_t)(n) & ~SEXP_FIXNUM_TAG))/(sexp_sint_t)(1uL<<SEXP_FIXNUM_BITS))
+#define my_obj_obj2int(n)   (((long)((ulong)(n) & ~1))/(long)(1uL<<1))
 //
 ///**
 // * Convert from an integer to an object.
 // */
-#define my_obj_int2obj(c) ((void *)((((long)c)<<1) | 1))
+//#define my_obj_int2obj(c) ((void *)((((long)c)<<1) | 1))
+#define my_obj_int2obj(n)    ((void *) ((((long)(n))*(long)(1uL<<1)) | 1))
+//+#define sexp_make_fixnum(n)    ((sexp) ((((sexp_sint_t)(n))*(sexp_sint_t)(1uL<<SEXP_FIXNUM_BITS)) | SEXP_FIXNUM_TAG))
 
 void main()
 {
@@ -24,4 +26,11 @@ void main()
   printf("%p\n", my_obj_int2obj(-1));
   printf("%d\n", my_obj_obj2int(tmp));
   printf("%d\n", my_obj_is_int(tmp));
+
+  tmp = my_obj_int2obj(-0x7fffffff);
+  printf("%p\n", my_obj_int2obj(-0x7fffffff));
+  printf("%d\n", my_obj_obj2int(tmp));
+  printf("%d\n", my_obj_is_int(tmp));
+
+  printf("%x\n", (uint)~1);
 }