From 699e9e1e400ce179c6d5ba60cf1ea4ca064e9c3a Mon Sep 17 00:00:00 2001 From: Stephen Adams Date: Sat, 29 Jan 1994 21:57:32 +0000 Subject: [PATCH] Changed null-environment to be xor(#F,1) rather than TC_NULL::1. This is how it is defined in the new microcode and happens to be correct for the current microcode. --- v7/src/runtime/uenvir.scm | 14 +++++++++----- v8/src/runtime/uenvir.scm | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/v7/src/runtime/uenvir.scm b/v7/src/runtime/uenvir.scm index 5cf4a9417..78118f3e2 100644 --- a/v7/src/runtime/uenvir.scm +++ b/v7/src/runtime/uenvir.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: uenvir.scm,v 14.31 1994/01/29 00:51:52 gjr Exp $ +$Id: uenvir.scm,v 14.32 1994/01/29 21:57:32 adams Exp $ Copyright (c) 1988-1992 Massachusetts Institute of Technology @@ -240,8 +240,15 @@ MIT in each case. |# (define (ic-environment/remove-parent! environment) (ic-environment/set-parent! environment null-environment)) + +;; This corresponds to the #defines in sdata.h + (define null-environment - (object-new-type (ucode-type null) 1)) + (object-new-type (object-type #F) + (fix:xor (object-datum #F) 1))) + +;;(define null-environment +;; (object-new-type (ucode-type null) 1)) (define (make-null-interpreter-environment) (let ((environment (let () (the-environment)))) @@ -324,9 +331,6 @@ MIT in each case. |# default)))) (define (compiled-procedure/environment entry) - (if (not (compiled-procedure? entry)) - (error "Not a compiled procedure" entry - 'COMPILED-PROCEDURE/ENVIRONMENT)) (let ((procedure (compiled-entry/dbg-object entry))) (if (not procedure) (error "Unable to obtain closing environment" entry)) diff --git a/v8/src/runtime/uenvir.scm b/v8/src/runtime/uenvir.scm index 5cf4a9417..78118f3e2 100644 --- a/v8/src/runtime/uenvir.scm +++ b/v8/src/runtime/uenvir.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: uenvir.scm,v 14.31 1994/01/29 00:51:52 gjr Exp $ +$Id: uenvir.scm,v 14.32 1994/01/29 21:57:32 adams Exp $ Copyright (c) 1988-1992 Massachusetts Institute of Technology @@ -240,8 +240,15 @@ MIT in each case. |# (define (ic-environment/remove-parent! environment) (ic-environment/set-parent! environment null-environment)) + +;; This corresponds to the #defines in sdata.h + (define null-environment - (object-new-type (ucode-type null) 1)) + (object-new-type (object-type #F) + (fix:xor (object-datum #F) 1))) + +;;(define null-environment +;; (object-new-type (ucode-type null) 1)) (define (make-null-interpreter-environment) (let ((environment (let () (the-environment)))) @@ -324,9 +331,6 @@ MIT in each case. |# default)))) (define (compiled-procedure/environment entry) - (if (not (compiled-procedure? entry)) - (error "Not a compiled procedure" entry - 'COMPILED-PROCEDURE/ENVIRONMENT)) (let ((procedure (compiled-entry/dbg-object entry))) (if (not procedure) (error "Unable to obtain closing environment" entry)) -- 2.25.1