* cleanup

[ChangeLog]
2001-01-23  Frank Ch. Eigler  <fche@redhat.com>

	* configrun-sid.in: Become a shell script.  Use "eval exec perl" hack
	to divert to a perl interpreter on $PATH, instead of /usr/bin/env.

[pregen/ChangeLog]
2001-01-23  Frank Ch. Eigler  <fche@redhat.com>

	* arm-pid-cygmon.conf, arm-pid-cygmon-tksm.com: Regenerated.

diff --git a/sid/bsp/ChangeLog b/sid/bsp/ChangeLog
index 35c3c5e..79a056b 100644 (file)
--- a/sid/bsp/ChangeLog
+++ b/sid/bsp/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-23  Frank Ch. Eigler  <fche@redhat.com>
+
+       * configrun-sid.in: Become a shell script.  Use "eval exec perl" hack
+       to divert to a perl interpreter on $PATH, instead of /usr/bin/env.
+
+2001-01-23  Frank Ch. Eigler  <fche@redhat.com>
+       * configrun-sid.in (cpu=arm): Don't include $sidsharelib in ROM image
+       file paths.
+
 2001-01-15  Frank Ch. Eigler  <fche@redhat.com>
 
        * configrun-sid.in (--verbose, --persistent): Only emit these settings

diff --git a/sid/bsp/configrun-sid.in b/sid/bsp/configrun-sid.in
index f96e671..6f5d55b 100644 (file)
--- a/sid/bsp/configrun-sid.in
+++ b/sid/bsp/configrun-sid.in
@@ -1,9 +1,13 @@
-#! /usr/bin/env perl
+:
 # -*- perl -*-
 #
 # Emulate a standalone simulator.  Construct a sid configuration file
 # and run it.
 
+eval 'exec perl -S $0 ${1+"$@"}'
+    if $running_under_some_shell;
+$running_under_some_shell = 0;
+
 #use strict;
 use Getopt::Long;
 require 5.004;
@@ -407,12 +411,12 @@ elsif ($opt_board =~ /pid7t/)
     if ($opt_board =~ /cygmon/)
       {
        die "board pid7t-cygmon only supported in little-endian mode (-EL)\n" unless ($opt_EL);
-       unshift @opt_memory_region, ( "0x04000000,0x00100000,file=$sidsharedir/armpid-cygmon.img,read-only" );
+       unshift @opt_memory_region, ( "0x04000000,0x00100000,file=armpid-cygmon.img,read-only" );
       }
     elsif ($opt_board =~ /eCosstub/)
       {
        die "board pid7t-eCos only supported in little-endian mode (-EL)\n" unless ($opt_EL);
-       unshift @opt_memory_region, ( "0x04000000,0x00100000,file=$sidsharedir/armpid-eCos.img,read-only" );
+       unshift @opt_memory_region, ( "0x04000000,0x00100000,file=armpid-eCos.img,read-only" );
       }
     else
       {

diff --git a/sid/bsp/pregen/ChangeLog b/sid/bsp/pregen/ChangeLog
index bf20786..72a02fc 100644 (file)
--- a/sid/bsp/pregen/ChangeLog
+++ b/sid/bsp/pregen/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-23  Frank Ch. Eigler  <fche@redhat.com>
+
+       * arm-pid-cygmon.conf, arm-pid-cygmon-tksm.com: Regenerated.
+
 2001-01-15  Frank Ch. Eigler  <fche@redhat.com>
 
        * *.conf: Regenerated.

diff --git a/sid/bsp/pregen/arm-pid-cygmon-tksm.conf b/sid/bsp/pregen/arm-pid-cygmon-tksm.conf
index 0179fe7..3fdfcba 100644 (file)
--- a/sid/bsp/pregen/arm-pid-cygmon-tksm.conf
+++ b/sid/bsp/pregen/arm-pid-cygmon-tksm.conf
@@ -133,11 +133,11 @@ connect-pin uart1 Sin <- uart1-console rx
 new hw-memory-ram/rom-basic mem1
 set mem1 size 16777216
 connect-bus mapper mem1:[0,16777215] mem1 read-write-port
-# memory region 2 (0x04000000,0x00100000,file=/home/fche/INST/share/sid/armpid-cygmon.img,read-only)
+# memory region 2 (0x04000000,0x00100000,file=armpid-cygmon.img,read-only)
 new hw-memory-ram/rom-basic mem2
 set mem2 size 1048576
 connect-bus mapper mem2:[67108864,68157439] mem2 read-only-port
-set mem2 image-file "/home/fche/INST/share/sid/armpid-cygmon.img"
+set mem2 image-file "armpid-cygmon.img"
 connect-pin init-sequence output-1 -> mem2 image-load
 # tcl/tk adaptive event polling
 connect-pin host-sched 2-event -> tcl-event-consumer !event

diff --git a/sid/bsp/pregen/arm-pid-cygmon.conf b/sid/bsp/pregen/arm-pid-cygmon.conf
index 2a60557..7e3c57b 100644 (file)
--- a/sid/bsp/pregen/arm-pid-cygmon.conf
+++ b/sid/bsp/pregen/arm-pid-cygmon.conf
@@ -122,9 +122,9 @@ connect-pin uart1 Sin <- uart1-console rx
 new hw-memory-ram/rom-basic mem1
 set mem1 size 16777216
 connect-bus mapper mem1:[0,16777215] mem1 read-write-port
-# memory region 2 (0x04000000,0x00100000,file=/home/fche/INST/share/sid/armpid-cygmon.img,read-only)
+# memory region 2 (0x04000000,0x00100000,file=armpid-cygmon.img,read-only)
 new hw-memory-ram/rom-basic mem2
 set mem2 size 1048576
 connect-bus mapper mem2:[67108864,68157439] mem2 read-only-port
-set mem2 image-file "/home/fche/INST/share/sid/armpid-cygmon.img"
+set mem2 image-file "armpid-cygmon.img"
 connect-pin init-sequence output-1 -> mem2 image-load