From 852e455b2a027776b8e50bd8dfee308ad41937e3 Mon Sep 17 00:00:00 2001 From: Raymond Toy <toy.raymond@gmail.com> Date: Mon, 4 Jan 2021 09:18:59 -0800 Subject: [PATCH] Rename *fp-constant-0s0* to *fp-constant-0f0* Besides the obvious, we need to update genesis to fill in the slot with the correct value. --- src/code/x86-vm.lisp | 2 +- src/compiler/generic/new-genesis.lisp | 18 ++---------------- src/compiler/x86/float-sse2.lisp | 2 +- src/compiler/x86/parms.lisp | 2 +- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/src/code/x86-vm.lisp b/src/code/x86-vm.lisp index 3adae9862..8313e0f4d 100644 --- a/src/code/x86-vm.lisp +++ b/src/code/x86-vm.lisp @@ -430,7 +430,7 @@ ;;; cases. Note these are initialise by genesis as they are needed ;;; early. ;;; -(defvar *fp-constant-0s0*) +(defvar *fp-constant-0f0*) (defvar *fp-constant-0d0*) ;;; The current alien stack pointer; saved/restored for non-local diff --git a/src/compiler/generic/new-genesis.lisp b/src/compiler/generic/new-genesis.lisp index bae4df750..2fd9974a3 100644 --- a/src/compiler/generic/new-genesis.lisp +++ b/src/compiler/generic/new-genesis.lisp @@ -914,22 +914,8 @@ (macrolet ((frob (name pkg value) `(cold-setq (cold-intern (intern ,name ,pkg)) ,value))) (frob "*FP-CONSTANT-0D0*" "X86" (number-to-core 0d0)) - (frob "*FP-CONSTANT-1D0*" "X86" (number-to-core 1d0)) - (frob "*FP-CONSTANT-0S0*" "X86" (number-to-core 0s0)) - (frob "*FP-CONSTANT-1S0*" "X86" (number-to-core 1s0)) - #+long-float - (when (c:backend-featurep :long-float) - (frob "*FP-CONSTANT-0L0*" "X86" (number-to-core 0l0)) - (frob "*FP-CONSTANT-1L0*" "X86" (number-to-core 1l0)) - (frob "*FP-CONSTANT-PI*" "X86" (number-to-core pi)) - (frob "*FP-CONSTANT-L2T*" "X86" (number-to-core (log 10l0 2l0))) - (frob "*FP-CONSTANT-L2E*" "X86" - (number-to-core - (log 2.718281828459045235360287471352662L0 2l0))) - (frob "*FP-CONSTANT-LG2*" "X86" (number-to-core (log 2l0 10l0))) - (frob "*FP-CONSTANT-LN2*" "X86" - (number-to-core - (log 2l0 2.718281828459045235360287471352662L0)))) + (frob "*FP-CONSTANT-0F0*" "X86" (number-to-core 0f0)) + (when (c:backend-featurep :gencgc) (frob "*SCAVENGE-READ-ONLY-SPACE*" "X86" (cold-intern nil))))) diff --git a/src/compiler/x86/float-sse2.lisp b/src/compiler/x86/float-sse2.lisp index 67ae88ba9..b44fc201b 100644 --- a/src/compiler/x86/float-sse2.lisp +++ b/src/compiler/x86/float-sse2.lisp @@ -449,7 +449,7 @@ (:results (y :scs (descriptor-reg))) (:generator 2 (ecase (c::constant-value (c::tn-leaf x)) - (0f0 (load-symbol-value y *fp-constant-0s0*)) + (0f0 (load-symbol-value y *fp-constant-0f0*)) #+nil (1f0 (load-symbol-value y *fp-constant-1s0*)) (0d0 (load-symbol-value y *fp-constant-0d0*)) diff --git a/src/compiler/x86/parms.lisp b/src/compiler/x86/parms.lisp index bb293e398..0b5235705 100644 --- a/src/compiler/x86/parms.lisp +++ b/src/compiler/x86/parms.lisp @@ -351,7 +351,7 @@ ;; The FP constants *fp-constant-0d0* - *fp-constant-0s0* + *fp-constant-0f0* ;; Multi-process support. *control-stacks* -- GitLab