Fix for "*" getting bad section attributes, reported by A. Seed.

diff --git a/68kgen.c b/68kgen.c
index b2a6f81c164d4b1d3363641efe91f5ce42f6bbb9..c5ea85f9756627958871e19b6dbe28670de7e5ca 100644 (file)
--- a/68kgen.c
+++ b/68kgen.c
@@ -3,7 +3,7 @@
 // 68KGEN.C - Tool to Generate 68000 Opcode Table
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // 68KGEN.C - Tool to Generate 68000 Opcode Table
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include <stdio.h>
 //
 
 #include <stdio.h>

diff --git a/amode.c b/amode.c
index 915499c9a1cda5f6a699881dd3c49cd4609eb8f8..875c324d6175ffe77304c157ab2cb29ff7dcb8f5 100644 (file)
--- a/amode.c
+++ b/amode.c
@@ -3,7 +3,7 @@
 // AMODE.C - Addressing Modes
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // AMODE.C - Addressing Modes
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "amode.h"
 //
 
 #include "amode.h"

diff --git a/amode.h b/amode.h
index 5632fe9a26139380c4c8c5d095a7194932d9297a..eba0e5f7af1685a7a72b2f119cba66917a08c97a 100644 (file)
--- a/amode.h
+++ b/amode.h
@@ -3,7 +3,7 @@
 // AMODE.H - Addressing Modes
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // AMODE.H - Addressing Modes
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __AMODE_H__
 //
 
 #ifndef __AMODE_H__

diff --git a/debug.c b/debug.c
index ac57aa5a50076469a51bedc0bd243a862c262a64..7e60196089b68d11d0c6dbdf823e68a77e70d284 100644 (file)
--- a/debug.c
+++ b/debug.c
@@ -3,7 +3,7 @@
 // DEBUG.C - Debugging Messages
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // DEBUG.C - Debugging Messages
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "debug.h"
 //
 
 #include "debug.h"

diff --git a/debug.h b/debug.h
index 9d6f278964f047e6be5c9b8272c060ab42c6e329..456f94575386aacd44dc9b003891bdbf84112d27 100644 (file)
--- a/debug.h
+++ b/debug.h
@@ -3,7 +3,7 @@
 // DEBUG.H - Debugging Messages
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // DEBUG.H - Debugging Messages
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __DEBUG_H__
 //
 
 #ifndef __DEBUG_H__

diff --git a/direct.c b/direct.c
index 5cdac4ca73b605c297caf6c0b870480677898fd4..3146c5345599c18d9703daa1c787ce157e961ceb 100644 (file)
--- a/direct.c
+++ b/direct.c
@@ -3,7 +3,7 @@
 // DIRECT.C - Directive Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // DIRECT.C - Directive Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "direct.h"
 //
 
 #include "direct.h"

diff --git a/direct.h b/direct.h
index a047c3ca29a4649e0f389de1b3fec92caca2e922..42070de522932e149a48674ec6359477742886f0 100644 (file)
--- a/direct.h
+++ b/direct.h
@@ -3,7 +3,7 @@
 // DIRECT.H - Directive Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // DIRECT.H - Directive Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __DIRECT_H__
 //
 
 #ifndef __DIRECT_H__

diff --git a/eagen.c b/eagen.c
index f76e51e04170ac822b2f983e7cb6221bc21980b0..d230c1b2cb96f9f31be9f168bf8cf951fd2886f2 100644 (file)
--- a/eagen.c
+++ b/eagen.c
@@ -3,7 +3,7 @@
 // EAGEN.C - Effective Address Code Generation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // EAGEN.C - Effective Address Code Generation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "rmac.h"
 //
 
 #include "rmac.h"

diff --git a/eagen0.c b/eagen0.c
index c3feb2c0baaba382f51a72cfc1be110b31b406cc..c95d8b677146703d9d22354357de924cbd7c8ae5 100644 (file)
--- a/eagen0.c
+++ b/eagen0.c
@@ -4,7 +4,7 @@
 //            Generated Code for eaN (Included twice by "eagen.c")
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 //            Generated Code for eaN (Included twice by "eagen.c")
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 int eaNgen(WORD siz)
 //
 
 int eaNgen(WORD siz)

diff --git a/error.c b/error.c
index 75efaadfa50c0077e705555e7be6ccdcaf9415d9..83a6f372f73e869e6e3a9abc2ec9c12ffe0c16a9 100644 (file)
--- a/error.c
+++ b/error.c
@@ -3,7 +3,7 @@
 // ERROR.C - Error Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // ERROR.C - Error Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "error.h"
 //
 
 #include "error.h"

diff --git a/error.h b/error.h
index 255027ad8bf99d9d45bb0df5dfd79dd16f0e5b02..06d9e466f0ad4eafe9a43ecd50724788617393b9 100644 (file)
--- a/error.h
+++ b/error.h
@@ -3,7 +3,7 @@
 // ERROR.H - Error Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // ERROR.H - Error Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __ERROR_H__
 //
 
 #ifndef __ERROR_H__

diff --git a/expr.c b/expr.c
index deeea40a893300bba19bf3b587b18b78ad47a072..8e2c33aa11f93e37538e13a75a91daa293d5832f 100644 (file)
--- a/expr.c
+++ b/expr.c
@@ -3,7 +3,7 @@
 // EXPR.C - Expression Analyzer
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // EXPR.C - Expression Analyzer
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "expr.h"
 //
 
 #include "expr.h"


@@ -278,7 +278,8 @@ int expr2(void)
 
                // pcloc == location at start of line
                *evalTokenBuffer++ = (orgactive ? orgaddr : pcloc);
 
                // pcloc == location at start of line
                *evalTokenBuffer++ = (orgactive ? orgaddr : pcloc);

-               *evalTokenBuffer++ = ABS | DEFINED;                     // Store attribs
+               // '*' takes attributes of current section, not ABS!
+               *evalTokenBuffer++ = cursect | DEFINED;

                break;
        default:
                return error("bad expression");
                break;
        default:
                return error("bad expression");


@@ -347,7 +348,8 @@ int expr(TOKEN * otk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
                        else
                                *evalTokenBuffer++ = *a_value = pcloc;
 
                        else
                                *evalTokenBuffer++ = *a_value = pcloc;
 

-                       *a_attr = ABS | DEFINED;
+                       // '*' takes attributes of current section, not ABS!
+                       *a_attr = cursect | DEFINED;

 
                        if (a_esym != NULL)
                                *a_esym = NULL;
 
                        if (a_esym != NULL)
                                *a_esym = NULL;


@@ -416,9 +418,11 @@ thrown away right here. What the hell is it for?
 */
                        if (symbol->sattre & EQUATEDREG) 
                                *a_value &= 0x1F;
 */
                        if (symbol->sattre & EQUATEDREG) 
                                *a_value &= 0x1F;

+

                        *a_attr = (WORD)(symbol->sattr & ~GLOBAL);
 
                        *a_attr = (WORD)(symbol->sattr & ~GLOBAL);
 

-                       if ((symbol->sattr & (GLOBAL | DEFINED)) == GLOBAL && a_esym != NULL)
+                       if ((symbol->sattr & (GLOBAL | DEFINED)) == GLOBAL
+                               && a_esym != NULL)

                                *a_esym = symbol;
 
                        tok += 2;
                                *a_esym = symbol;
 
                        tok += 2;


@@ -499,7 +503,7 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
                        }
 
                        *++sattr = (WORD)(sy->sattr & ~GLOBAL); // Push attribs
                        }
 
                        *++sattr = (WORD)(sy->sattr & ~GLOBAL); // Push attribs

-                       sym_seg = (WORD)(sy->sattr & (TEXT | DATA | BSS));
+                       sym_seg = (WORD)(sy->sattr & TDB);

                        break;
                case CONST:
 //printf("evexpr(): CONST = %i\n", *tk);
                        break;
                case CONST:
 //printf("evexpr(): CONST = %i\n", *tk);


@@ -529,9 +533,9 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
                        --sattr;                                                // Pop attrib 
                        *sval += sval[1];                               // Compute value
 
                        --sattr;                                                // Pop attrib 
                        *sval += sval[1];                               // Compute value
 

-                       if (!(*sattr & (TEXT | DATA | BSS)))
+                       if (!(*sattr & TDB))

                                *sattr = sattr[1];
                                *sattr = sattr[1];

-                       else if (sattr[1] & (TEXT | DATA | BSS))
+                       else if (sattr[1] & TDB)

                                return error(seg_error);
 
                        break;
                                return error(seg_error);
 
                        break;


@@ -541,23 +545,22 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
                        --sattr;                                                // Pop attrib 
                        *sval -= sval[1];                               // Compute value
 
                        --sattr;                                                // Pop attrib 
                        *sval -= sval[1];                               // Compute value
 

-                       attr = (WORD)(*sattr & (TEXT | DATA | BSS));
-
+                       attr = (WORD)(*sattr & TDB);
+#if 0
+printf("EVEXPR (-): sym1 = %X, sym2 = %X\n", attr, sattr[1]);
+#endif
+                       // If symbol1 is ABS, take attributes from symbol2

                        if (!attr)
                                *sattr = sattr[1];
                        if (!attr)
                                *sattr = sattr[1];

-                       else if (sattr[1] & (TEXT | DATA | BSS))
-                       {
-                               if (!(attr & sattr[1]))
-                                       return error(seg_error);
-                               else
-                                       *sattr &= ~(TEXT | DATA | BSS);
-                       }
+                       // Otherwise, they're both TDB and so attributes cancel out
+                       else if (sattr[1] & TDB)
+                               *sattr &= ~TDB;

 
                        break;
                // Unary operators only work on ABS items
                case UNMINUS:
 //printf("evexpr(): UNMINUS\n");
 
                        break;
                // Unary operators only work on ABS items
                case UNMINUS:
 //printf("evexpr(): UNMINUS\n");

-                       if (*sattr & (TEXT | DATA | BSS))
+                       if (*sattr & TDB)

                                error(seg_error);
 
                        *sval = -(int)*sval;
                                error(seg_error);
 
                        *sval = -(int)*sval;


@@ -565,7 +568,7 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
                        break;
                case '!':
 //printf("evexpr(): !\n");
                        break;
                case '!':
 //printf("evexpr(): !\n");

-                       if (*sattr & (TEXT | DATA | BSS))
+                       if (*sattr & TDB)

                                error(seg_error);
 
                        *sval = !*sval;
                                error(seg_error);
 
                        *sval = !*sval;


@@ -573,7 +576,7 @@ int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
                        break;
                case '~':
 //printf("evexpr(): ~\n");
                        break;
                case '~':
 //printf("evexpr(): ~\n");

-                       if (*sattr & (TEXT | DATA | BSS))
+                       if (*sattr & TDB)

                                error(seg_error);
 
                        *sval = ~*sval;
                                error(seg_error);
 
                        *sval = ~*sval;

diff --git a/expr.h b/expr.h
index ad83d2807d67eca0827dca5bb504e7a2258b85ee..96b8e2a99746e9913a36832911cda1f3b414ddaa 100644 (file)
--- a/expr.h
+++ b/expr.h
@@ -3,7 +3,7 @@
 // EXPR.H - Expression Analyzer
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // EXPR.H - Expression Analyzer
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __EXPR_H__
 //
 
 #ifndef __EXPR_H__

diff --git a/kwgen.c b/kwgen.c
index 8404d670dd57fc65827d11f9c9c01be76db183f4..b644b106ffac2ae27e7722e25d4d9b1b3e45f15e 100644 (file)
--- a/kwgen.c
+++ b/kwgen.c
@@ -3,7 +3,7 @@
 // KWGEN.C - Keyword & Mnemonic Definition and State Machine Creation Tool
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // KWGEN.C - Keyword & Mnemonic Definition and State Machine Creation Tool
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 /*
 //
 
 /*

diff --git a/listing.c b/listing.c
index f9064cd228bd34635335da864913088dc6aa4315..4fadfefb4278efba66037ec9ab65224e2a080554 100644 (file)
--- a/listing.c
+++ b/listing.c
@@ -3,7 +3,7 @@
 // LISTING.C - Listing Output
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // LISTING.C - Listing Output
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 // --------------------------------------------------------------------------
 // 0    0    1    1    2    2    3    3    4    4    5    5    6    6    7    7
 //
 // --------------------------------------------------------------------------
 // 0    0    1    1    2    2    3    3    4    4    5    5    6    6    7    7

diff --git a/listing.h b/listing.h
index bef97bc26e50d996414ae36acc25bd0c2d9defb3..457ff1fd7b96d6379933e04c1b2eb72553db4eea 100644 (file)
--- a/listing.h
+++ b/listing.h
@@ -3,7 +3,7 @@
 // LISTING.H - Listing Output
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // LISTING.H - Listing Output
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __LISTING_H__
 //
 
 #ifndef __LISTING_H__

diff --git a/mach.c b/mach.c
index db4512325ea2e9826d81768fe697d131e47e87cc..46193d7a8953b958757d1ab35db4f07b3524b015 100644 (file)
--- a/mach.c
+++ b/mach.c
@@ -3,7 +3,7 @@
 // MACH.C - Code Generation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // MACH.C - Code Generation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "mach.h"
 //
 
 #include "mach.h"

diff --git a/mach.h b/mach.h
index 9add0a351ef7c0504eec12e5100b48e754a7dc72..f10ff310f54e4da05d69e7dae867b5bc1266b301 100644 (file)
--- a/mach.h
+++ b/mach.h
@@ -3,7 +3,7 @@
 // MACH.H - Code Generation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // MACH.H - Code Generation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __MACH_H__
 //
 
 #ifndef __MACH_H__

diff --git a/macro.c b/macro.c
index 39c31ef235cdb7122f8ad1691023101b1de5327c..5aaa842a52d78d75c4808d676b384a54d5e1d914 100644 (file)
--- a/macro.c
+++ b/macro.c
@@ -3,7 +3,7 @@
 // MACRO.C - Macro Definition and Invocation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // MACRO.C - Macro Definition and Invocation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "macro.h"
 //
 
 #include "macro.h"

diff --git a/macro.h b/macro.h
index 9b45c5b0662b3d0d4e78df2eaac420e061a7f552..bca6d2f578008e11f7ed13cc88abb03db5298e9b 100644 (file)
--- a/macro.h
+++ b/macro.h
@@ -3,7 +3,7 @@
 // MACRO.H - Macro Definition and Invocation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // MACRO.H - Macro Definition and Invocation
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __MACRO_H__
 //
 
 #ifndef __MACRO_H__

diff --git a/makefile b/makefile
index def563cb1c9ccb50318c1a5136316fbb5f6a2026..33b9cfe43d5e4227b39f1779b50031ed5a310efc 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,8 +1,7 @@
 #
 # RMAC - Reboot's Macro Assembler for the Atari Jaguar
 # Copyright (C) 199x Landon Dyer, 2011 Reboot & Friends
 #
 # RMAC - Reboot's Macro Assembler for the Atari Jaguar
 # Copyright (C) 199x Landon Dyer, 2011 Reboot & Friends

-# MAKEFILE for Non-Windows Compilation
-# Currently tested against Cygwin under Windows XP Pro
+# MAKEFILE for *nix

 #
 
 rm = /bin/rm -f 
 #
 
 rm = /bin/rm -f 


@@ -25,7 +24,8 @@ all : mntab.h 68ktab.h kwtab.h risckw.h rmac
        @echo
 
 #
        @echo
 
 #

-# Generated Sources for State Machines and Keyword, Directive and Mnemonic Definitions
+# Generated sources for state machines and keyword, directive and mnemonic
+# definitions

 #
 
 mntab.h : mntab 68kmn kwgen
 #
 
 mntab.h : mntab 68kmn kwgen


@@ -41,7 +41,7 @@ risckw.h : kwtab kwgen
        ./kwgen mr <risctab >risckw.h
 
 #
        ./kwgen mr <risctab >risckw.h
 
 #

-# Build Tools
+# Build tools

 #
 
 kwgen.o : kwgen.c
 #
 
 kwgen.o : kwgen.c


@@ -57,7 +57,7 @@ kwgen : kwgen.o
        $(HOSTCC) $(CFLAGS) -o 68kgen 68kgen.o
 
 #
        $(HOSTCC) $(CFLAGS) -o 68kgen 68kgen.o
 
 #

-# Build RMAC Executable
+# Build RMAC executable

 #
 
 amode.o : amode.c
 #
 
 amode.o : amode.c


@@ -115,7 +115,7 @@ rmac : $(OBJS)
        $(CC) $(CFLAGS) -o rmac $(OBJS)
 
 #
        $(CC) $(CFLAGS) -o rmac $(OBJS)
 
 #

-# Clean Build Environment
+# Clean build environment

 #
 
 clean: 
 #
 
 clean: 

diff --git a/mark.c b/mark.c
index 4a7fe1b7680e4226f1d9b8b4a164fdac6e6bad74..ed76b4effc9116a5762d65bcbd4f9c73aab9d3bd 100644 (file)
--- a/mark.c
+++ b/mark.c
@@ -3,7 +3,7 @@
 // MARK.C - A record of things that are defined relative to any of the sections
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // MARK.C - A record of things that are defined relative to any of the sections
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "mark.h"
 //
 
 #include "mark.h"

diff --git a/mark.h b/mark.h
index d234d3a6f2d8666a5ad5f04912b8c357b9cdd031..e53ae6583f373ec344bae61bf3ac310444256c6e 100644 (file)
--- a/mark.h
+++ b/mark.h
@@ -3,7 +3,7 @@
 // MARK.H - A record of things that are defined relative to any of the sections
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // MARK.H - A record of things that are defined relative to any of the sections
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __MARK_H__
 //
 
 #ifndef __MARK_H__

diff --git a/object.c b/object.c
index 772c03ddbe801cc6bc70962cdb603e36232419a9..d8b4b577017d2729031544cf7639325960a65bdb 100644 (file)
--- a/object.c
+++ b/object.c
@@ -3,7 +3,7 @@
 // OBJECT.C - Writing Object Files
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // OBJECT.C - Writing Object Files
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "object.h"
 //
 
 #include "object.h"

diff --git a/object.h b/object.h
index 77d8bcb0c1562a09ccb3676fe7420fad37ca7e59..26a1960e7395a63851c45ab2872a6a229f7b378b 100644 (file)
--- a/object.h
+++ b/object.h
@@ -3,7 +3,7 @@
 // OBJECT.H - Writing Object Files
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // OBJECT.H - Writing Object Files
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __OBJECT_H__
 //
 
 #ifndef __OBJECT_H__

diff --git a/parmode.h b/parmode.h
index 13805fd47cb2958ac575c796e935bfdd847c67a5..543701ace549f4bb9e9ee4c879888a1f6cab2c70 100644 (file)
--- a/parmode.h
+++ b/parmode.h
@@ -3,7 +3,7 @@
 // PARMODE.C - Addressing Modes Parser Include
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // PARMODE.C - Addressing Modes Parser Include
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 // This file is included (twice) to parse two addressing modes, into slightly
 //
 
 // This file is included (twice) to parse two addressing modes, into slightly

diff --git a/procln.c b/procln.c
index 44b94d698332703eca6e06b0f5a784b7e086f9b5..8739ce6db05630d2a1726efb0efdae67f9042c12 100644 (file)
--- a/procln.c
+++ b/procln.c
@@ -3,7 +3,7 @@
 // PROCLN.C - Line Processing
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // PROCLN.C - Line Processing
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "procln.h"
 //
 
 #include "procln.h"


@@ -629,10 +629,10 @@ checking to see if it's already been equated, issue a warning.
                goto loop;
        }
 
                goto loop;
        }
 

-       if (sloc & 1)                                                   // Automatic .even
+       if (sloc & 1)                                   // Automatic .even

                auto_even();
 
                auto_even();
 

-       if (challoc - ch_size < 18)                             // Make sure have space in current chunk
+       if (challoc - ch_size < 18)             // Make sure have space in current chunk

                chcheck(0);
 
        m = &machtab[state - 1000];
                chcheck(0);
 
        m = &machtab[state - 1000];


@@ -644,7 +644,7 @@ checking to see if it's already been equated, issue a warning.
                goto loop;
        }
 
                goto loop;
        }
 

-       if (amode(1) < 0)                                               // Parse 0, 1 or 2 addr modes
+       if (amode(1) < 0)                               // Parse 0, 1 or 2 addr modes

                goto loop;
 
        if (*tok != EOL)
                goto loop;
 
        if (*tok != EOL)

diff --git a/procln.h b/procln.h
index 05d481ce90c30257a5cb144cebf22e79dc843d19..4a64dbd7912f9d872ac3630599b09b5284f2700e 100644 (file)
--- a/procln.h
+++ b/procln.h
@@ -3,7 +3,7 @@
 // PROCLN.H - Line Processing
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // PROCLN.H - Line Processing
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __PROCLN_H__
 //
 
 #ifndef __PROCLN_H__

diff --git a/riscasm.h b/riscasm.h
index b2320ac16ac2857d20fe3fa9146c6fc651929892..a91f703fb7ce5f369cfc4bfc27c6f7137731e8b7 100644 (file)
--- a/riscasm.h
+++ b/riscasm.h
@@ -3,7 +3,7 @@
 // RISCA.H - GPU/DSP Assembler
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // RISCA.H - GPU/DSP Assembler
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __RISCA_H__
 //
 
 #ifndef __RISCA_H__

diff --git a/rmac.c b/rmac.c
index 3f5a9b59758f551d53a0be14bb7d77001091f510..ae44c750ded296248692f0a833cc478d45e4bf70 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -3,7 +3,7 @@
 // RMAC.C - Main Application Code
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // RMAC.C - Main Application Code
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "rmac.h"
 //
 
 #include "rmac.h"

diff --git a/rmac.h b/rmac.h
index e0f53df54e131d5a3d1ef3d89d3259dbe0bca40e..faa176ca8a69dfa967d856f1c5f17422d4211f4a 100644 (file)
--- a/rmac.h
+++ b/rmac.h
@@ -3,7 +3,7 @@
 // RMAC.H - Main Application Code
 // Copyright (C) 199x Landon Dyer, 2011 Reboot & Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // RMAC.H - Main Application Code
 // Copyright (C) 199x Landon Dyer, 2011 Reboot & Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __RMAC_H__
 //
 
 #ifndef __RMAC_H__

diff --git a/sect.c b/sect.c
index ab5c4aab8dc831a56539c65f04d0231c3d637175..7331cb3d765c4e867ce727cb39bce3b9e0c711d1 100644 (file)
--- a/sect.c
+++ b/sect.c
@@ -3,7 +3,7 @@
 // SECT.C - Code Generation, Fixups and Section Management
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // SECT.C - Code Generation, Fixups and Section Management
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "sect.h"
 //
 
 #include "sect.h"

diff --git a/sect.h b/sect.h
index f7c3aafd8a3fde6c5c4a876230a3afb3ec01422a..d64e130ee32b87ff30f327c5915eca60bd418190 100644 (file)
--- a/sect.h
+++ b/sect.h
@@ -3,7 +3,7 @@
 // SECT.H - Code Generation, Fixups and Section Management
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // SECT.H - Code Generation, Fixups and Section Management
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __SECT_H__
 //
 
 #ifndef __SECT_H__

diff --git a/symbol.c b/symbol.c
index 71e7bf5948a95eb01417f5f62c9c2f87b384f7b9..9ba661fc3fa931609a7f34eb1c95c5aa84d33d6c 100644 (file)
--- a/symbol.c
+++ b/symbol.c
@@ -3,7 +3,7 @@
 // SYMBOL.C - Symbol Handling
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // SYMBOL.C - Symbol Handling
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "symbol.h"
 //
 
 #include "symbol.h"

diff --git a/symbol.h b/symbol.h
index 73a2dca9622b6913ceca4cf5ae9115b154753589..485ed8864bc9f7e97b7079f5e99c643b1552a0c6 100644 (file)
--- a/symbol.h
+++ b/symbol.h
@@ -3,7 +3,7 @@
 // SYMBOL.H - Symbol Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // SYMBOL.H - Symbol Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __SYMBOL_H__
 //
 
 #ifndef __SYMBOL_H__

diff --git a/token.c b/token.c
index 250aa46bded07a66d02aa6cfd4705270a3d687b3..5f076a231cff1793394adaa0bba7a1a9b6fbed2d 100644 (file)
--- a/token.c
+++ b/token.c
@@ -3,7 +3,7 @@
 // TOKEN.C - Token Handling
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // TOKEN.C - Token Handling
 // Copyright (C) 199x Landon Dyer, 2011-2012 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #include "token.h"
 //
 
 #include "token.h"

diff --git a/token.h b/token.h
index c7dc4b194cceffc74eecbb50a4bdf02f5f727e84..501f1eaaca237be8c6dfec97c230c6bccbba4789 100644 (file)
--- a/token.h
+++ b/token.h
@@ -3,7 +3,7 @@
 // TOKEN.H - Token Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // TOKEN.H - Token Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __TOKEN_H__
 //
 
 #ifndef __TOKEN_H__

diff --git a/version.h b/version.h
index 1e4e7aea901f8fe10c243b7dfb9a68b32b83bf33..67cf96c17d5a9a9b79a5ebf657524532ff2c3fd5 100644 (file)
--- a/version.h
+++ b/version.h
@@ -3,7 +3,7 @@
 // VERSION.H - Version Information
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // VERSION.H - Version Information
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986

-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer

 //
 
 #ifndef __VERSION_H__
 //
 
 #ifndef __VERSION_H__


@@ -13,6 +13,6 @@
 
 #define MAJOR   1              // Major version number
 #define MINOR   3              // Minor version number
 
 #define MAJOR   1              // Major version number
 #define MINOR   3              // Minor version number

-#define PATCH   3              // Patch release number
+#define PATCH   4              // Patch release number

 
 #endif // __VERSION_H__
 
 #endif // __VERSION_H__