From bf82687051b7d916423917eb54a6f94f86033ee8 Mon Sep 17 00:00:00 2001 From: "U-SLAVA-FB3999113\\Slava" Date: Mon, 15 Oct 2007 19:59:35 -0400 Subject: [PATCH] More ARM changes --- core/cpu/arm/5/5.factor | 3 --- core/cpu/arm/5/authors.txt | 1 - core/cpu/arm/5/summary.txt | 1 - vm/cpu-arm.S | 2 +- vm/data_gc.c | 0 vm/factor.c | 2 +- vm/io.c | 2 ++ 7 files changed, 4 insertions(+), 7 deletions(-) delete mode 100755 core/cpu/arm/5/5.factor delete mode 100644 core/cpu/arm/5/authors.txt delete mode 100644 core/cpu/arm/5/summary.txt mode change 100644 => 100755 vm/data_gc.c mode change 100644 => 100755 vm/io.c diff --git a/core/cpu/arm/5/5.factor b/core/cpu/arm/5/5.factor deleted file mode 100755 index ae07345cd1..0000000000 --- a/core/cpu/arm/5/5.factor +++ /dev/null @@ -1,3 +0,0 @@ -USING: cpu.arm.assembler cpu.arm4 namespaces ; - -t have-BLX? set-global diff --git a/core/cpu/arm/5/authors.txt b/core/cpu/arm/5/authors.txt deleted file mode 100644 index 1901f27a24..0000000000 --- a/core/cpu/arm/5/authors.txt +++ /dev/null @@ -1 +0,0 @@ -Slava Pestov diff --git a/core/cpu/arm/5/summary.txt b/core/cpu/arm/5/summary.txt deleted file mode 100644 index 5c697fe27e..0000000000 --- a/core/cpu/arm/5/summary.txt +++ /dev/null @@ -1 +0,0 @@ -Additional compiler intrinsics for ARM5 diff --git a/vm/cpu-arm.S b/vm/cpu-arm.S index 532908b772..ba49eb8fdb 100755 --- a/vm/cpu-arm.S +++ b/vm/cpu-arm.S @@ -114,7 +114,7 @@ DEF(void,set_callstack,(F_STACK_FRAME *to, F_STACK_FRAME *from, CELL length)): ldr pc,LR_SAVE /* return */ DEF(void,throw_impl,(CELL quot, F_STACK_FRAME *rewind_to)): - mov sp,r1 /* compute new stack pointer */ + add sp,r1,#4 /* compute new stack pointer */ ldr lr,LR_SAVE /* we have rewound the stack; load return address */ JUMP_QUOT /* call the quotation */ diff --git a/vm/data_gc.c b/vm/data_gc.c old mode 100644 new mode 100755 diff --git a/vm/factor.c b/vm/factor.c index d5e3ab23cf..b611fb05ba 100755 --- a/vm/factor.c +++ b/vm/factor.c @@ -140,7 +140,7 @@ void init_factor_from_args(F_CHAR *image, int argc, F_CHAR **argv, bool embedded if(p.fep) factorbug(); - c_to_factor_toplevel(userenv[BOOT_ENV]); + c_to_factor(userenv[BOOT_ENV]); unnest_stacks(); for(i = 0; i < argc; i++) diff --git a/vm/io.c b/vm/io.c old mode 100644 new mode 100755 index f6cc62736c..bc7d057abf --- a/vm/io.c +++ b/vm/io.c @@ -19,8 +19,10 @@ void init_c_io(void) void io_error(void) { +#ifndef WINCE if(errno == EINTR) return; +#endif CELL error = tag_object(from_char_string(strerror(errno))); general_error(ERROR_IO,error,F,NULL);