From ee9fafd1839882f1a4ff1442d59c7f01de7df96a Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 2 Nov 2007 03:52:48 -0500 Subject: [PATCH] ARM fixes --- core/cpu/arm/architecture/architecture.factor | 2 +- core/cpu/arm/arm.factor | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/cpu/arm/architecture/architecture.factor b/core/cpu/arm/architecture/architecture.factor index 07a4a073de..cadfcfda14 100755 --- a/core/cpu/arm/architecture/architecture.factor +++ b/core/cpu/arm/architecture/architecture.factor @@ -278,7 +278,7 @@ M: arm-backend %alien-indirect ( -- ) M: arm-backend %alien-callback ( quot -- ) R0 load-indirect - "run_callback" f %alien-invoke ; + "c_to_factor" f %alien-invoke ; M: arm-backend %callback-value ( ctype -- ) ! Save top of data stack diff --git a/core/cpu/arm/arm.factor b/core/cpu/arm/arm.factor index ca37912790..f6d851e36b 100755 --- a/core/cpu/arm/arm.factor +++ b/core/cpu/arm/arm.factor @@ -3,7 +3,7 @@ USING: alien alien.c-types kernel math namespaces cpu.architecture cpu.arm.architecture cpu.arm.assembler cpu.arm.intrinsics generator generator.registers continuations -compiler io vocabs.loader sequences ; +compiler io vocabs.loader sequences system ; ! EABI passes floats in integer registers. [ alien-float ] @@ -53,4 +53,4 @@ T{ arm-backend } compiler-backend set-global t have-BLX? set-global ] when -7 cells set-profiler-prologue +7 cells set-profiler-prologues