Browse Source

Merge branch 'master' of https://github.com/mntmn/interim

mntmn 8 years ago
parent
commit
b1fa2aa5be
2 changed files with 15 additions and 5 deletions
  1. 13 4
      README.md
  2. 2 1
      sledge/compiler_x64_hosted.c

+ 13 - 4
README.md

@@ -9,6 +9,7 @@ Interim runs on:
 - Raspberry Pi 2 (Broadcom VideoCore4/ARMv7, Bare Metal)
 - ARM5+ Linux (Hosted)
 - Intel/AMD x64 Linux, Mac OS X (Hosted)
+- Intel/AMD x86 Linux, Windows (Hosted, win32 .exe cross compiled from Linux)
 - Motorola 68020+ Amiga OS 3.x+ (Hosted)
 
 Detailed docs are in *docs/index.html*.
@@ -16,11 +17,11 @@ Detailed docs are in *docs/index.html*.
 Contact / FAQ / Get Involved
 ----------------------------
 
-To coordinate the development efforts, there is now an official mailing list. The best for technical discussion is there:
+To coordinate the development efforts, there is now an official mailing list. The best place for technical discussion is there:
 
 http://sympa.mntmn.com/info/interim-dev
 
-If you find bugs, please file an issue in the ![Github issue tracker](https://github.com/mntmn/interim/issues).
+If you find bugs, please file an issue in the [Github issue tracker](https://github.com/mntmn/interim/issues).
 
 Architecture
 ------------
@@ -29,8 +30,6 @@ Architecture
 - Layer 1: Sledge Lisp JIT Compiler
 - Layer 0: Platform Interface (Startup code and filesystems)
 
-![Interim OS Screenshot](http://dump.mntmn.com/interim-paper/illustrations/interim-picture.jpg)
-
 Design Choices
 --------------
 
@@ -65,6 +64,16 @@ Running (Raspberry Pi 2)
 
 Prepare a bootable SD card with the usual FAT partition that has the Pi-specific boot blobs in it and copy ````kernel.img```` into it. You can recycle any other Raspberry OS distribution, i.e. Raspian for this. Just replace the kernel7.img and delete cmdline.txt. Keyboard input is currently only over UART, so you will probably want to connect a UART->USB cable to another computer and use it to control Interim. 
 
+![Interim OS Screenshot](http://dump.mntmn.com/interim-paper/illustrations/interim-picture.jpg)
+
+Roadmap
+-------
+
+- IEEE 754 double-precision floating point numbers.
+- Vectors.
+- Native string maps (dictionaries) based on the existing sd_hash.
+- JavaScript to Interim Lisp compiler.
+
 Licenses
 --------
 

+ 2 - 1
sledge/compiler_x64_hosted.c

@@ -66,10 +66,11 @@ int compile_for_platform(Cell* expr, Cell** res) {
         
     // prefix with arm-none-eabi- on ARM  -mlittle-endian
     
-    system("as -L /tmp/jit_out.s -o /tmp/jit_out.o");
 #if defined(__APPLE__) && defined(__MACH__)
+    system("clang -no-integrated-as -c /tmp/jit_out.s -o /tmp/jit_out.o -Xassembler -L");
     system("gobjcopy /tmp/jit_out.o -O binary /tmp/jit_out.bin");
 #else
+    system("as -L /tmp/jit_out.s -o /tmp/jit_out.o");
     system("objcopy /tmp/jit_out.o -O binary /tmp/jit_out.bin");
 #endif