From 1687d9285ca9d8fbc59de84987e3241025468351 Mon Sep 17 00:00:00 2001 From: "Guillermo J. Rozas" Date: Fri, 16 Jul 1993 19:59:07 +0000 Subject: [PATCH] Kludge to make defaulting of directory work under DOS (and NT?). --- v7/src/compiler/etc/comfiles.scm | 7 +++++-- v7/src/compiler/etc/disload.scm | 11 +++++++---- v8/src/compiler/etc/comfiles.scm | 7 +++++-- v8/src/compiler/etc/disload.scm | 11 +++++++---- 4 files changed, 24 insertions(+), 12 deletions(-) diff --git a/v7/src/compiler/etc/comfiles.scm b/v7/src/compiler/etc/comfiles.scm index 28599130a..3fc871cb6 100644 --- a/v7/src/compiler/etc/comfiles.scm +++ b/v7/src/compiler/etc/comfiles.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: comfiles.scm,v 1.3 1993/06/30 21:39:32 gjr Exp $ +$Id: comfiles.scm,v 1.4 1993/07/16 19:59:07 gjr Exp $ Copyright (c) 1989-1993 Massachusetts Institute of Technology @@ -37,7 +37,10 @@ MIT in each case. |# (declare (usual-integrations)) (define compiler-directories - '("back" "base" "fggen" "fgopt" "machine" "rtlbase" "rtlgen" "rtlopt")) + '("back" "base" "fggen" "fgopt" "rtlbase" "rtlgen" "rtlopt" + (if (equal? microcode-id/operating-system-name "unix") + "machine" + "machines/i386"))) (define runtime-directories '("runtime" "sf" "cref")) diff --git a/v7/src/compiler/etc/disload.scm b/v7/src/compiler/etc/disload.scm index a439c0478..12cf8c739 100644 --- a/v7/src/compiler/etc/disload.scm +++ b/v7/src/compiler/etc/disload.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: disload.scm,v 1.6 1993/07/01 22:52:20 gjr Exp $ +$Id: disload.scm,v 1.7 1993/07/16 19:58:09 gjr Exp $ Copyright (c) 1993 Massachusetts Institute of Technology @@ -38,9 +38,12 @@ MIT in each case. |# (define (load-disassembler #!optional directory addressing-granularity) (with-working-directory-pathname - (if (default-object? directory) - "/usr/local/lib/mit-scheme/SRC/compiler/machine" - directory) + (cond ((not (default-object? directory)) + directory) + ((equal? microcode-id/operating-system-name "unix") + "/usr/local/lib/mit-scheme/SRC/compiler/machine") + (else + "/scheme/compiler/machines/i386")) (lambda () (let* ((parent (or (name->package '(compiler)) (find-package '()))) diff --git a/v8/src/compiler/etc/comfiles.scm b/v8/src/compiler/etc/comfiles.scm index 28599130a..3fc871cb6 100644 --- a/v8/src/compiler/etc/comfiles.scm +++ b/v8/src/compiler/etc/comfiles.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: comfiles.scm,v 1.3 1993/06/30 21:39:32 gjr Exp $ +$Id: comfiles.scm,v 1.4 1993/07/16 19:59:07 gjr Exp $ Copyright (c) 1989-1993 Massachusetts Institute of Technology @@ -37,7 +37,10 @@ MIT in each case. |# (declare (usual-integrations)) (define compiler-directories - '("back" "base" "fggen" "fgopt" "machine" "rtlbase" "rtlgen" "rtlopt")) + '("back" "base" "fggen" "fgopt" "rtlbase" "rtlgen" "rtlopt" + (if (equal? microcode-id/operating-system-name "unix") + "machine" + "machines/i386"))) (define runtime-directories '("runtime" "sf" "cref")) diff --git a/v8/src/compiler/etc/disload.scm b/v8/src/compiler/etc/disload.scm index a439c0478..12cf8c739 100644 --- a/v8/src/compiler/etc/disload.scm +++ b/v8/src/compiler/etc/disload.scm @@ -1,6 +1,6 @@ #| -*-Scheme-*- -$Id: disload.scm,v 1.6 1993/07/01 22:52:20 gjr Exp $ +$Id: disload.scm,v 1.7 1993/07/16 19:58:09 gjr Exp $ Copyright (c) 1993 Massachusetts Institute of Technology @@ -38,9 +38,12 @@ MIT in each case. |# (define (load-disassembler #!optional directory addressing-granularity) (with-working-directory-pathname - (if (default-object? directory) - "/usr/local/lib/mit-scheme/SRC/compiler/machine" - directory) + (cond ((not (default-object? directory)) + directory) + ((equal? microcode-id/operating-system-name "unix") + "/usr/local/lib/mit-scheme/SRC/compiler/machine") + (else + "/scheme/compiler/machines/i386")) (lambda () (let* ((parent (or (name->package '(compiler)) (find-package '()))) -- 2.25.1