From eab59267eba48354cf23ad729a1ec05acbd9687c Mon Sep 17 00:00:00 2001
From: Martin Ruckert <ruckert@cs.hm.edu>
Date: Fri, 11 Sep 2015 17:12:31 +0000
Subject: [PATCH] fixing breakpoints and output for translation bypassed in
 mmixvd

---
 mmixlib/customizevd.vcproj | 56 ++++++++++++++++++++++++++++++++------
 mmixlib/libconfig.ide      |  4 +++
 mmixlib/libconfig.vd       |  4 +++
 mmixlib/libimport.vd       |  7 ++++-
 mmixlib/mmixallib.ch       |  2 +-
 mmixlib/mmixlib.ch         |  9 ++++--
 mmixlib/mmixlib.h          |  2 --
 7 files changed, 70 insertions(+), 14 deletions(-)

diff --git a/mmixlib/customizevd.vcproj b/mmixlib/customizevd.vcproj
index 00c9dbe..139f289 100644
--- a/mmixlib/customizevd.vcproj
+++ b/mmixlib/customizevd.vcproj
@@ -185,10 +185,10 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="copying libconfig.vd"
-						CommandLine="copy $(InputDir)libconfig.vd  $(InputDir)libconfig.h"
-						AdditionalDependencies="$(InputDir)libconfig.vd"
-						Outputs="$(InputDir)libconfig.h"
+						Description=""
+						CommandLine=""
+						AdditionalDependencies=""
+						Outputs=""
 					/>
 				</FileConfiguration>
 				<FileConfiguration
@@ -196,16 +196,36 @@
 					>
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="copying libconfig.vd"
-						CommandLine="copy $(InputDir)libconfig.vd  $(InputDir)libconfig.h"
-						AdditionalDependencies="$(InputDir)libconfig.vd"
-						Outputs="$(InputDir)libconfig.h"
+						Description=""
+						CommandLine=""
+						AdditionalDependencies=""
+						Outputs=""
 					/>
 				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\mmixlib\libconfig.vd"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="copy libconfig.vd  to libconfig.h"
+						CommandLine="copy $(InputDir)libconfig.vd  $(InputDir)libconfig.h"
+						Outputs="$(InputDir)libconfig.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="copy libconfig.vd  to libconfig.h"
+						CommandLine="copy $(InputDir)libconfig.vd  $(InputDir)libconfig.h"
+						Outputs="$(InputDir)libconfig.h"
+					/>
+				</FileConfiguration>
 			</File>
 			<File
 				RelativePath="..\mmixlib\libimport.h"
@@ -236,6 +256,26 @@
 			<File
 				RelativePath="..\mmixlib\libimport.vd"
 				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="copy libimport.vd  to libimport.h"
+						CommandLine="copy $(InputDir)libimport.vd  $(InputDir)libimport.h"
+						Outputs="$(InputDir)libimport.h"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="copy libimport.vd  to libimport.h"
+						CommandLine="copy $(InputDir)libimport.vd  $(InputDir)libimport.h"
+						Outputs="$(InputDir)libimport.h"
+					/>
+				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter
diff --git a/mmixlib/libconfig.ide b/mmixlib/libconfig.ide
index e3cbcb9..3bb1e55 100644
--- a/mmixlib/libconfig.ide
+++ b/mmixlib/libconfig.ide
@@ -110,4 +110,8 @@ extern int mmix_fputc(int c, FILE *f);
 /* define this to record file line and location associations while assembling */
 #define MMIXAL_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc)
 
+/* define this to record file line and location associations while loading mmo files
+   undefine to get the default behaviour of recording this info in the mem_tetra */
+#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc)
+
 #endif
diff --git a/mmixlib/libconfig.vd b/mmixlib/libconfig.vd
index f6f9645..b7ec918 100644
--- a/mmixlib/libconfig.vd
+++ b/mmixlib/libconfig.vd
@@ -2,6 +2,7 @@
 #define LIBCONFIG_H
 
 /* This is the libconfig.h file for MMIX VD  rename to libconfig.h */
+
 #ifdef WIN32
 #pragma warning(disable : 4996)
 #endif
@@ -93,5 +94,8 @@ extern int mmix_fputc(int c, FILE *f);
 /* define this to record file line and location associations while assembling */
 #define MMIXAL_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc)
 
+/* define this to record file line and location associations while loading mmo files */
+#define MMIX_LOAD_LINE_LOC(file_no,line_no,cur_loc) add_line_loc(file_no,line_no,cur_loc)
+
 #endif
 
diff --git a/mmixlib/libimport.vd b/mmixlib/libimport.vd
index 2255916..8262251 100644
--- a/mmixlib/libimport.vd
+++ b/mmixlib/libimport.vd
@@ -1,3 +1,8 @@
+/* This is the libimport.h file for MMIX VD  rename to libimport.h */
+
 extern void win32_log(char *msg);
 extern void win32_ferror(int line, char *format, char *str);
-extern void win32_message(char *msg);
\ No newline at end of file
+extern void win32_message(char *msg);
+
+extern void add_line_loc(int file_no, int line_no, octa loc);
+/* report the association of a file/line with a location */
diff --git a/mmixlib/mmixallib.ch b/mmixlib/mmixallib.ch
index 0351993..ade2a62 100644
--- a/mmixlib/mmixallib.ch
+++ b/mmixlib/mmixallib.ch
@@ -227,7 +227,7 @@ the association of lines and locations.
  for (j=0;j<k;j++) {
 @z
 
-We allocate tree nodes node by node so that we can free them again.
+We allocate tree nodes, node by node, so that we can free them again.
 
 @x
   register trie_node *t=next_trie_node;
diff --git a/mmixlib/mmixlib.ch b/mmixlib/mmixlib.ch
index 8eb0eb8..0760858 100644
--- a/mmixlib/mmixlib.ch
+++ b/mmixlib/mmixlib.ch
@@ -265,12 +265,17 @@ static mem_tetra *load_mem_tetra(octa loc, tetra val)
 @z
 
 Before we increment the line number,
-we reset the frequency.
+we reset the frequency and possibly record file, line, and loc.
 
 @x
+    ll->file_no=cur_file;
+    ll->line_no=cur_line;
     cur_line++;
 @y
+    ll->file_no=cur_file;
+    ll->line_no=cur_line;
     ll->freq=0;
+    MMIX_LOAD_LINE_LOC(cur_file,cur_line,cur_loc);
     cur_line++;
 @z
 
@@ -1345,7 +1350,7 @@ case SWYM:
  else
    strcpy(rhs,"");
 break;
-translation_bypassed_inst: strcpy(lhs,"!absolute address");
+translation_bypassed_inst: strcpy(lhs,"!negative address in load/store");
 g[rQ].h |= N_BIT; new_Q.h |= N_BIT; /* set the n bit */
  goto break_inst;
 privileged_inst: strcpy(lhs,"!kernel only");
diff --git a/mmixlib/mmixlib.h b/mmixlib/mmixlib.h
index 4845346..659cd46 100644
--- a/mmixlib/mmixlib.h
+++ b/mmixlib/mmixlib.h
@@ -256,8 +256,6 @@ extern void report_error(char *message, int file_no, int line_no);
 /* report an error in the given file and line. 
  */
 
-extern void add_line_loc(int file_no, int line_no, octa loc);
-/* report the association of a file/line with a location */
 
 extern int mmoimg_main(int argc, char *argv[]);
 
-- 
GitLab