Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
micropython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
xpstem
micropython
Commits
d8b08cf5
Commit
d8b08cf5
authored
Jan 15, 2016
by
Damien George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
unix: Add option to build 64-bit NaN-boxing interpreter.
Build using: make nanbox
parent
ff133cdb
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
57 additions
and
0 deletions
+57
-0
unix/Makefile
unix/Makefile
+11
-0
unix/mpconfigport.h
unix/mpconfigport.h
+3
-0
unix/mpconfigport_nanbox.h
unix/mpconfigport_nanbox.h
+43
-0
No files found.
unix/Makefile
View file @
d8b08cf5
...
@@ -126,6 +126,8 @@ ifeq ($(PROG),micropython)
...
@@ -126,6 +126,8 @@ ifeq ($(PROG),micropython)
SRC_C
+=
$(BUILD)
/_frozen_upip.c
SRC_C
+=
$(BUILD)
/_frozen_upip.c
else
ifeq
($(PROG),micropython_coverage)
else
ifeq
($(PROG),micropython_coverage)
SRC_C
+=
$(BUILD)
/_frozen_upip.c
SRC_C
+=
$(BUILD)
/_frozen_upip.c
else
ifeq
($(PROG), micropython_nanbox)
SRC_C
+=
$(BUILD)
/_frozen_upip.c
else
ifeq
($(PROG), micropython_freedos)
else
ifeq
($(PROG), micropython_freedos)
SRC_C
+=
$(BUILD)
/_frozen_upip.c
SRC_C
+=
$(BUILD)
/_frozen_upip.c
endif
endif
...
@@ -171,6 +173,15 @@ fast:
...
@@ -171,6 +173,15 @@ fast:
minimal
:
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
$(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
:
freedos
:
$(MAKE)
\
$(MAKE)
\
CC
=
i586-pc-msdosdjgpp-gcc
\
CC
=
i586-pc-msdosdjgpp-gcc
\
...
...
unix/mpconfigport.h
View file @
d8b08cf5
...
@@ -182,6 +182,8 @@ extern const struct _mp_obj_module_t mp_module_jni;
...
@@ -182,6 +182,8 @@ extern const struct _mp_obj_module_t mp_module_jni;
// type definitions for the specific machine
// 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__
#ifdef __LP64__
typedef
long
mp_int_t
;
// must be pointer size
typedef
long
mp_int_t
;
// must be pointer size
typedef
unsigned
long
mp_uint_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
...
@@ -191,6 +193,7 @@ typedef unsigned long mp_uint_t; // must be pointer size
typedef
int
mp_int_t
;
// must be pointer size
typedef
int
mp_int_t
;
// must be pointer size
typedef
unsigned
int
mp_uint_t
;
// must be pointer size
typedef
unsigned
int
mp_uint_t
;
// must be pointer size
#endif
#endif
#endif
#define BYTES_PER_WORD sizeof(mp_int_t)
#define BYTES_PER_WORD sizeof(mp_int_t)
...
...
unix/mpconfigport_nanbox.h
0 → 100644
View file @
d8b08cf5
/*
* 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>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment