diff --git a/README.txt b/README.txt index 1310d862cf..a0eeda21c4 100644 --- a/README.txt +++ b/README.txt @@ -11,7 +11,6 @@ implementation. It is not an introduction to the language itself. - Building Factor - Running Factor on Unix with X11 - Running Factor on Mac OS X -- Running Factor on Windows - Source organization - Community - Credits @@ -163,6 +162,7 @@ Slava Pestov: Lead developer Alex Chapman: OpenGL binding Doug Coleman: Mersenne Twister RNG, Windows port Eduardo Cavazos: X11 binding +Joshua Grams: PowerPC instruction cache flush code Mackenzie Straight: Windows port Trent Buck: Debian package diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt index 0691aeb4d3..3f7f96057f 100644 --- a/TODO.FACTOR.txt +++ b/TODO.FACTOR.txt @@ -21,6 +21,7 @@ + ui: +- why is the thumb skewed? - add some handy services: - base conversion - search help for selection diff --git a/license.txt b/license.txt index a0d1c7298a..7229e7c12c 100644 --- a/license.txt +++ b/license.txt @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003, 2006 Slava Pestov. + * Copyright (C) 2003, 2006 Slava Pestov and friends. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: diff --git a/vm/cpu-ppc.S b/vm/cpu-ppc.S index 254426ea48..e6b1858098 100644 --- a/vm/cpu-ppc.S +++ b/vm/cpu-ppc.S @@ -4,9 +4,7 @@ On PowerPC processors, we must flush the instruction cache manually after writing to the code heap. Callable from C as -void flush_icache(void *start, int len) - -This function is called from compiler.c. */ +void flush_icache(void *start, int len) */ #ifdef __APPLE__ #define MANGLE(sym) _##sym diff --git a/vm/cpu-x86.h b/vm/cpu-x86.h index 3115d3f211..2c1f24f07c 100644 --- a/vm/cpu-x86.h +++ b/vm/cpu-x86.h @@ -1,4 +1,4 @@ -#define FACTOR_CPU_STRING "ppc" +#define FACTOR_CPU_STRING "x86" register CELL ds asm("esi"); register CELL rs asm("edi"); diff --git a/vm/os-macosx-ppc.h b/vm/os-macosx-ppc.h index 6faf0c0de1..c3e5556d09 100644 --- a/vm/os-macosx-ppc.h +++ b/vm/os-macosx-ppc.h @@ -7,7 +7,7 @@ #define SIGSEGV_STACK_POINTER(thr_state) (thr_state).r1 #define SIGSEGV_PROGRAM_COUNTER(thr_state) (thr_state).srr0 -INLINE void fix_stack_ptr(unsigned long sp) +INLINE unsigned long fix_stack_ptr(unsigned long sp) { return sp; } diff --git a/vm/os-macosx-x86.h b/vm/os-macosx-x86.h index 5257ca6452..98de91dc4f 100644 --- a/vm/os-macosx-x86.h +++ b/vm/os-macosx-x86.h @@ -7,7 +7,7 @@ #define SIGSEGV_STACK_POINTER(thr_state) (thr_state).esp #define SIGSEGV_PROGRAM_COUNTER(thr_state) (thr_state).eip -INLINE void fix_stack_ptr(unsigned long sp) +INLINE unsigned long fix_stack_ptr(unsigned long sp) { if ((sp & 0xf) != 0) sp -= (sp & 0xf); sp -= 4;