- If ^^filesize could not open the requested file, it would show "(null)" as the...

- Changed one '#include <...>' to 'include "..."'
- Minor doc additions
- Added 'dirent_lose.c/.h' to Visual Studio project

diff --git a/Vs2015/rmac/rmac.vcxproj b/Vs2015/rmac/rmac.vcxproj
index 8e0b0ff9a5113f366fe072fb7c957116178cc1ec..3b2a6b49038bb7e8eda7e73b2ac6410fd8bc17f0 100644 (file)
--- a/Vs2015/rmac/rmac.vcxproj
+++ b/Vs2015/rmac/rmac.vcxproj
@@ -23,6 +23,7 @@
     <ClCompile Include="..\..\amode.c" />
     <ClCompile Include="..\..\debug.c" />
     <ClCompile Include="..\..\direct.c" />
+    <ClCompile Include="..\..\dirent_lose.c" />
     <ClCompile Include="..\..\dsp56k.c" />
     <ClCompile Include="..\..\dsp56k_amode.c" />
     <ClCompile Include="..\..\dsp56k_mach.c" />
@@ -48,6 +49,7 @@
     <ClInclude Include="..\..\68ktab.h" />
     <ClInclude Include="..\..\amode.h" />
     <ClInclude Include="..\..\debug.h" />
+    <ClCompile Include="..\..\dirent_lose.h" />
     <ClInclude Include="..\..\direct.h" />
     <ClInclude Include="..\..\dsp56k.h" />
     <ClInclude Include="..\..\dsp56k_amode.h" />
@@ -241,4 +243,4 @@ maketabs.bat</Command>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>

diff --git a/docs/rmac.rst b/docs/rmac.rst
index b3d25db0eab34c65016e5c4b8e9e14646d78038e..0c7c5ff9f064455251b4ed315c2c28c34146ecd2 100644 (file)
--- a/docs/rmac.rst
+++ b/docs/rmac.rst
@@ -11,8 +11,8 @@ version 2.0.23
 ===========
 
 *NOTE: Every effort has been made to ensure the accuracy and robustness of this
-manual and the associated software. However, because Reboot is constantly improving
-and updating its computer software, it is unable to guarantee
+manual and the associated software. However, the authors are constantly improving
+and updating its computer software, we is unable to guarantee
 the accuracy of printed or duplicated material after the date of publication and
 disclaims liability for changes, errors or omissions.*
 
@@ -36,7 +36,7 @@ runs on the any POSIX compatible platform and the Atari ST. It was initially wri
 at Atari Corporation by programmers who needed a high performance assembler
 for their work. Then, more than 20 years later, because there was still a need for
 such an assembler and what was available wasn't up to expectations, Subqmod
-and eventually Reboot continued work on the freely released source, adding Jaguar
+and eventually the rmac authors continued work on the freely released source, adding Jaguar
 extensions and fixing bugs. Over time the assembler has been extended by adding
 support for Motorola's 68020/30/40/60, 68881/2, DSP56001 CPUs as well as Atari's
 Object Processor (OP) found on the Atari Jaguar.
@@ -120,6 +120,7 @@ Switch               Description
 -e\ *[file[.err]]*   Direct error messages to the specified file.
 -fa                  ALCYON output object file format (implied when **-ps** is enabled).
 -fb                  BSD COFF output object file format.
+-fb                  Commodore 64 PRG format.
 -fe                  ELF output object file format.
 -fr                  Absolute address. Source code is required to have one .org statement.
 -fx                  Atari 800 com/exe/xex output object file format.
@@ -2076,6 +2077,9 @@ As the 6502 object code is not linkable (currently there is no linker) external
 references may not be made. (Nevertheless, RMAC may reasonably be used for
 large assemblies because of its blinding speed.)
 
+Currently there is no support for undocumented opcodes. This will be addressed
+in a future release.
+
 `6502 Addressing Modes`_
 ''''''''''''''''''''''''
 All standard 6502 addressing modes are supported, with the exception of the
@@ -2152,6 +2156,8 @@ the *.exe* format consists of chunks of this format (one after the other):
      04-05      End Address. The last byte to load for this segment
      06-..      The actual segment data to load (End Address-Start Address + 1 bytes)
 
+In addition there is the standard output format for Commodore 64 binaries (.PRG).
+
 `Error Messages`_
 =================
 

diff --git a/error.c b/error.c
index 5c54592df6d5100ad3ad552a7fe7a261f95db180..47cff9f29b4fae42afc48f96dade5e5eb92d351b 100644 (file)
--- a/error.c
+++ b/error.c
@@ -8,7 +8,7 @@
 
 #include "error.h"
 #include <stdarg.h>
-#include <token.h>
+#include "token.h"
 #include "listing.h"
 char * interror_msg[] = {
        "Unknown internal error",       // Error not referenced, should not be displayed

diff --git a/expr.c b/expr.c
index 30629dfae18cb1f0d8d993d2d52632874a340bba..e597257007880205a9032aea705581dee55e31cd 100644 (file)
--- a/expr.c
+++ b/expr.c
@@ -262,7 +262,7 @@ int expr1(void)
                                                goto allright;
                                }
 
-                               return error("cannot open: \"%s\"", string[tok[1]]);
+                               return error("cannot open: \"%s\"", string[*tok]);
                        }
 
 allright: