m_a_i_n --> _m_a_i_n

diff --git a/lang/a68s/liba68s/Makefile b/lang/a68s/liba68s/Makefile
index 7f17c1f..bb0ab82 100644 (file)
--- a/lang/a68s/liba68s/Makefile
+++ b/lang/a68s/liba68s/Makefile
@@ -1,7 +1,7 @@
 EMROOT=../../..
 ACK=$(EMROOT)/bin/$(MACH)
-PC=$(ACK) -.p -PR$(EMROOT)/lang/a68s/cpem/cpem
-PCFLAGS=-v -L -e -LIB -Oego -SR -CJ -BO -SP
+PC=/proj/em/bin/sun3 -.p -PR$(EMROOT)/lang/a68s/cpem/cpem -Ras=/proj/em/Work/lib/m68020/as -I/proj/em/h -Rbe=/proj/em/Work/lib/m68020/cg
+PCFLAGS=-v -L -e -LIB # -Oego -SR -CJ -BO -SP
 EPCFLAGS=-v -L -e -LIB $(BSD4) $(VAX4)
 UTIL=$(EMROOT)/lang/a68s/util
 TAILOR=$(UTIL)/tailor
@@ -65,7 +65,7 @@ run68g.o:     rundecsg.h run68g.p
                 cat run68g.p ) \
                    >temp.p
                $(PC) $(PCFLAGS) -c.s temp.p
-               sed -e '/^.define _m_a_i_n/d' -e '/^.extern _m_a_i_n/,$$d' -e '/^.globl _m_a_i_n/,$$d' temp.s > run68g.s
+               sed -e '/^.define __m_a_i_n/d' -e '/^.extern __m_a_i_n/,$$d' -e '/^.globl       __m_a_i_n/,$$d' temp.s > run68g.s
                $(PC) $(PCFLAGS) -c.o run68g.s
                rm temp.p run68g.s
 

diff --git a/lang/a68s/liba68s/e.h b/lang/a68s/liba68s/e.h
index e4c9b42..1e60627 100644 (file)
--- a/lang/a68s/liba68s/e.h
+++ b/lang/a68s/liba68s/e.h
@@ -24,11 +24,11 @@
 
 #if SZWORD==2
 #define PUTTVARSPACE 150 /* space, or greater used for locals in PUTT */
-#define GETTVARSPACE 350 /* space, or greater used for locals in GETT */
+#define GETTVARSPACE 350 /* exactly (!) space used for locals in GETT */
 #define LLC ldc         /* for loading bit patterns */
 #else
-#define PUTTVARSPACE 300
-#define GETTVARSPACE 700
+#define PUTTVARSPACE 212
+#define GETTVARSPACE 432
 #define LLC loc
 #endif
 #define HTOP 500   /* this must agree with what the compiler produces */

diff --git a/lang/a68s/liba68s/globale.e b/lang/a68s/liba68s/globale.e
index a9fb457..8d6dfb7 100644 (file)
--- a/lang/a68s/liba68s/globale.e
+++ b/lang/a68s/liba68s/globale.e
@@ -12,19 +12,19 @@
  pro $ESTART0,0
  lor 0                 ; my LB
  dup SZADDR
- dch                   ; m_a_i_n's LB
+ dch                   ; _m_a_i_n's LB
  dup SZADDR
- str 0                 ; pretend I am in m_a_i_n
+ str 0                 ; pretend I am in _m_a_i_n
  lae .HTOP-FIRSTIBOFFSET; destination address (holtop-firstiboffset)
  ; now calc how much to move
  lal 0
  lor 0
  sbs SZWORD            ; subtract address of param from lb to get link space
  loc SZWORD+SZADDR+SZADDR
- ads SZWORD            ; allow for one parameter of m_a_i_n
+ ads SZWORD            ; allow for one parameter of _m_a_i_n
  bls SZWORD            ; block move
                        ; now the global area contains an exact copy of
-                       ; m_a_i_n's stack frame, and main will subsequently
+                       ; _m_a_i_n's stack frame, and main will subsequently
                        ; adjust its LB to point to this global copy, thus
                        ; making it a part of the official stack.
  str 0                 ; get my LB back
@@ -54,7 +54,7 @@
  lxa 2
  cal $_ini
  asp SZADDR+SZADDR+SZADDR+SZADDR
- loc A68STAMP          ; m_a_i_n's frame stamp, for isa68, any positive number
+ loc A68STAMP          ; _m_a_i_n's frame stamp, for isa68, any positive number
  ste .HTOP-FSTAMPOFFSET ; it is in a SZWORD integer, 1st local var
  inp $_usigs
  cal $_usigs           ; catch UNIX interrupts as EM trap 15

diff --git a/lang/a68s/liba68s/run68g.p b/lang/a68s/liba68s/run68g.p
index 58a680a..0d5192c 100644 (file)
--- a/lang/a68s/liba68s/run68g.p
+++ b/lang/a68s/liba68s/run68g.p
@@ -1,5 +1,5 @@
 BEGIN (*of a68*)
 END; (*of a68*)
 
-BEGIN (*of m_a_i_n*)
+BEGIN (*of _m_a_i_n*)
 END. (*of everything*)