From b3a312456674bdba6211f1dfda9af12ab7565c6d Mon Sep 17 00:00:00 2001 From: slava Date: Tue, 14 Feb 2006 03:50:26 +0000 Subject: [PATCH] Bootstrap fix for PowerPC --- TODO.FACTOR.txt | 6 +++--- library/compiler/amd64/alien.factor | 2 -- library/compiler/generator.factor | 6 +++++- library/compiler/ppc/alien.factor | 2 -- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/TODO.FACTOR.txt b/TODO.FACTOR.txt index ab8cc05d3e..67871eb5b8 100644 --- a/TODO.FACTOR.txt +++ b/TODO.FACTOR.txt @@ -1,8 +1,8 @@ + portability: - port ffi to win64 -- x86 %unbox-struct -- amd64 %unbox-struct +- update x86 for %unbox-struct and callbacks +- update amd64 for %unbox-struct and callbacks - get factor running on mac intel + io: @@ -54,7 +54,7 @@ - remove literal table - callbacks - return values - - input values + - input values which get spilled - value type struct inputs - ffi unicode strings: null char security hole - utf16 string boxing diff --git a/library/compiler/amd64/alien.factor b/library/compiler/amd64/alien.factor index 1fb0b89ef0..c76c980a2e 100644 --- a/library/compiler/amd64/alien.factor +++ b/library/compiler/amd64/alien.factor @@ -50,5 +50,3 @@ M: %alien-invoke generate-node M: %box generate-node ( vop -- ) drop 0 input load-return-value 1 input f compile-c-call ; - -M: %cleanup generate-node ( vop -- ) drop ; diff --git a/library/compiler/generator.factor b/library/compiler/generator.factor index 5f9a468b7c..381b6d873e 100644 --- a/library/compiler/generator.factor +++ b/library/compiler/generator.factor @@ -60,7 +60,11 @@ M: %target-label generate-node ( vop -- ) M: %parameters generate-node ( vop -- ) drop ; -M: %parameter generate-node ( vop -- ) drop ; +M: %cleanup generate-node ( vop -- ) drop ; + +M: %freg>stack generate-node ( vop -- ) drop ; + +M: %stack>freg generate-node ( vop -- ) drop ; M: %alien-invoke generate-node #! call a C function. diff --git a/library/compiler/ppc/alien.factor b/library/compiler/ppc/alien.factor index c6636feda5..e675d6a048 100644 --- a/library/compiler/ppc/alien.factor +++ b/library/compiler/ppc/alien.factor @@ -58,8 +58,6 @@ M: %box generate-node ( vop -- ) ] when* 2 input f compile-c-call ; -M: %cleanup generate-node ( vop -- ) drop ; - M: %nullary-callback generate-node ( vop -- ) drop 3 0 input load-indirect