diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-03-01 19:57:02 +0000 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-03-01 19:57:02 +0000 |
| commit | 75a35c496d97d6d843304ceee22c0709fb3a72c8 (patch) | |
| tree | 128b98cc58e519683cad244094b9fa63bd5ff58b | |
| parent | 06201ff3d6d9485b2657fc9ac4aa8a306884322f (diff) | |
| parent | 9c7e984a05bd0b4ca799647e98ff4c938fbdf2a5 (diff) | |
| download | micropython-75a35c496d97d6d843304ceee22c0709fb3a72c8.tar.gz micropython-75a35c496d97d6d843304ceee22c0709fb3a72c8.zip | |
Merge pull request #330 from pfalcon/cortex-a
Support building "unix" port for ARM
| -rw-r--r-- | py/nlr.h | 14 | ||||
| -rw-r--r-- | py/nlrthumb.S | 2 |
2 files changed, 6 insertions, 10 deletions
@@ -3,23 +3,19 @@ #include <limits.h> -//#ifndef __WORDSIZE -//#error __WORDSIZE needs to be defined -//#endif - typedef struct _nlr_buf_t nlr_buf_t; struct _nlr_buf_t { // the entries here must all be machine word size nlr_buf_t *prev; void *ret_val; -#if __WORDSIZE == 32 +#if defined(__i386__) void *regs[6]; -#elif __WORDSIZE == 64 +#elif defined(__x86_64__) void *regs[8]; -#else - // hack for thumb +#elif defined(__thumb2__) void *regs[10]; -//#error Unsupported __WORDSIZE +#else +#error Unknown arch in nlr.h #endif }; diff --git a/py/nlrthumb.S b/py/nlrthumb.S index 22e0b6ba4d..8c6eb95522 100644 --- a/py/nlrthumb.S +++ b/py/nlrthumb.S @@ -2,7 +2,7 @@ /* thumb callee save: bx, bp, sp, r12, r14, r14, r15 */ .syntax unified - .cpu cortex-m4 + /*.cpu cortex-m4*/ .thumb .text .align 2 |