From d8b08cf5fcac5ea3bf28f27f9bfa5fc7465c209b Mon Sep 17 00:00:00 2001
From: Damien George <damien.p.george@gmail.com>
Date: Fri, 15 Jan 2016 11:12:08 +0000
Subject: [PATCH] unix: Add option to build 64-bit NaN-boxing interpreter.

Build using: make nanbox
---
 unix/Makefile              | 11 ++++++++++
 unix/mpconfigport.h        |  3 +++
 unix/mpconfigport_nanbox.h | 43 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)
 create mode 100644 unix/mpconfigport_nanbox.h

diff --git a/unix/Makefile b/unix/Makefile
index 159b07c82b..b149234342 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -126,6 +126,8 @@ ifeq ($(PROG),micropython)
 SRC_C += $(BUILD)/_frozen_upip.c
 else ifeq ($(PROG),micropython_coverage)
 SRC_C += $(BUILD)/_frozen_upip.c
+else ifeq ($(PROG), micropython_nanbox)
+SRC_C += $(BUILD)/_frozen_upip.c
 else ifeq ($(PROG), micropython_freedos)
 SRC_C += $(BUILD)/_frozen_upip.c
 endif
@@ -171,6 +173,15 @@ fast:
 minimal:
 	$(MAKE) COPT="-Os -DNDEBUG" CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_minimal.h>"' BUILD=build-minimal PROG=micropython_minimal MICROPY_PY_TIME=0 MICROPY_PY_TERMIOS=0 MICROPY_PY_SOCKET=0 MICROPY_PY_FFI=0 MICROPY_USE_READLINE=0
 
+# build interpreter with nan-boxing as object model
+nanbox:
+	$(MAKE) \
+	CFLAGS_EXTRA='-DMP_CONFIGFILE="<mpconfigport_nanbox.h>"' \
+	BUILD=build-nanbox \
+	PROG=micropython_nanbox \
+	MICROPY_FORCE_32BIT=1 \
+	MICROPY_PY_FFI=0
+
 freedos:
 	$(MAKE) \
 	CC=i586-pc-msdosdjgpp-gcc \
diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h
index 035c62883d..0eaa84d15c 100644
--- a/unix/mpconfigport.h
+++ b/unix/mpconfigport.h
@@ -182,6 +182,8 @@ extern const struct _mp_obj_module_t mp_module_jni;
 
 // type definitions for the specific machine
 
+// assume that if we already defined the obj repr then we also defined types
+#ifndef MICROPY_OBJ_REPR
 #ifdef __LP64__
 typedef long mp_int_t; // must be pointer size
 typedef unsigned long mp_uint_t; // must be pointer size
@@ -191,6 +193,7 @@ typedef unsigned long mp_uint_t; // must be pointer size
 typedef int mp_int_t; // must be pointer size
 typedef unsigned int mp_uint_t; // must be pointer size
 #endif
+#endif
 
 #define BYTES_PER_WORD sizeof(mp_int_t)
 
diff --git a/unix/mpconfigport_nanbox.h b/unix/mpconfigport_nanbox.h
new file mode 100644
index 0000000000..7da2cf7b80
--- /dev/null
+++ b/unix/mpconfigport_nanbox.h
@@ -0,0 +1,43 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016 Damien P. George
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+// select nan-boxing object model
+#define MICROPY_OBJ_REPR (MICROPY_OBJ_REPR_D)
+
+// native emitters don't work with nan-boxing
+#define MICROPY_EMIT_X86 (0)
+#define MICROPY_EMIT_X64 (0)
+#define MICROPY_EMIT_THUMB (0)
+#define MICROPY_EMIT_ARM (0)
+
+#include <stdint.h>
+
+typedef int64_t mp_int_t;
+typedef uint64_t mp_uint_t;
+#define UINT_FMT "%llu"
+#define INT_FMT "%lld"
+
+#include <mpconfigport.h>