move code into src/; update scripts

.gitignore

@@ -13,4 +13,12 @@
 /saturn.cat
 /stateDir.gwh_run48/
 /stateDir.gwh_run49/
-/*.o
+/src/*.o
+/saturn.toc
+/saturn.aux
+/saturn.cp
+/saturn.cps
+/saturn.dvi
+/saturn.info
+/saturn.pdf
+/saturn.ps

Imakefile

@@ -3,9 +3,9 @@
 # .identifier   : $Id: Imakefile,v 4.1 2000/12/11 09:54:19 cibrario Rel $
 # .context      : SATURN, Saturn CPU / HP48 emulator
 # .title        : $RCSfile: Imakefile,v $
-# .kind	        : Makefile
+# .kind		: Makefile
 # .author       : Ivan Cibrario B.
-# .site	        : CSTV-CNR
+# .site		: CSTV-CNR
 # .creation     : *
 # .keywords     : *
 # .description  :
@@ -93,13 +93,13 @@ PROGRAMS= saturn pack
 # Each row corresponds to a group of files; each group has its own
 # CHF module identifier and message catalog source file.
 #
-SRCS1=	debug.c \
-	cpu.c dis.c emulator.c monitor.c \
-	modules.c hw_config.c romram.c romram49.c hdw.c keyb.c \
-	disk_io.c disk_io_obj.c \
-	display.c x11.c \
-	serial.c flash49.c x_func.c\
-	saturn.c
+SRCS1=	src/debug.c \
+	src/cpu.c src/dis.c src/emulator.c src/monitor.c \
+	src/modules.c src/hw_config.c src/romram.c src/romram49.c src/hdw.c src/keyb.c \
+	src/disk_io.c src/disk_io_obj.c \
+	src/display.c src/x11.c \
+	src/serial.c src/flash49.c src/x_func.c\
+	src/saturn.c
 
 #
 # Message catalog source files for the modules defined above.
@@ -116,13 +116,13 @@ MSFS=	debug.msf \
 #
 # Source/object files of secondary target
 #
-SRCS2=	pack.c
+SRCS2=	src/pack.c
 
 #
 # Automatic generation of object file list
 #
 OBJS1=	$(SRCS1:.c=.o)
-OBJS2=	$(SRCS2:.c=.o) disk_io.o debug.o
+OBJS2=	$(SRCS2:.c=.o) src/disk_io.o src/debug.o
 
 #
 # Now, some extras... bring the Chf library in.

gwh_build.sh

@@ -1,7 +1,9 @@
 #!/bin/bash -eu
 
-make clean
 xmkmf
 
+make clean
+rm src/*.o
+
 make depend
 make

gwh_run48.sh

@@ -11,17 +11,12 @@ if [ ! -e $STATEDIR/gxrom-r ]; then
     )
 fi
 
-RAM="-ram ram"
+RAM=''
 if [ ! -e $STATEDIR/ram ]; then
-    RAM="-reset"
+    RAM=-reset
 fi
 
-if [ ! -e $STATEDIR/port1 ]; then
-    dd if=/dev/zero of=$STATEDIR/port1 bs=1k count=128
-fi
+[ ! -e $STATEDIR/port1 ] && dd if=/dev/zero of=$STATEDIR/port1 bs=1k count=128
+[ ! -e $STATEDIR/port2 ] && dd if=/dev/zero of=$STATEDIR/port2 bs=1k count=1024
 
-if [ ! -e $STATEDIR/port2 ]; then
-    dd if=/dev/zero of=$STATEDIR/port2 bs=1k count=1024
-fi
-
-./run_saturn -face hp48 -hw hp48 -stateDir $STATEDIR -rom gxrom-r "$RAM" -port1 port1 -port2 port2
+./run_saturn -face hp48 -hw hp48 -stateDir $STATEDIR -rom gxrom-r $RAM -port1 port1 -port2 port2

gwh_run49.sh

@@ -12,9 +12,9 @@ if [ ! -e $STATEDIR/rom.49g ]; then
     )
 fi
 
-RAM="-ram ram"
+RAM=''
 if [ ! -e $STATEDIR/ram ]; then
-    RAM="-reset"
+    RAM=-reset
 fi
 
-./run_saturn -face hp49 -hw hp49 -stateDir $STATEDIR -rom rom.49g "$RAM"
+./run_saturn -face hp49 -hw hp49 -stateDir $STATEDIR -rom rom.49g $RAM