From: Aaron Taylor <ataylor@subgeniuskitty.com>
Date: Thu, 10 Jan 2019 04:51:53 +0000 (-0800)
Subject: Fixed 2 bugs.
X-Git-Url: http://git.subgeniuskitty.com/ned1/.git/commitdiff_plain/d587e60834a0d4c2944c55fe9c500b878f66db94

Fixed 2 bugs.

BUG1: Fixed `neddis` failing to print final word of code.

BUG2: Added CC_FLAGS to command line options in Makefiles
      for nedsim/nedasm/neddis.
---

diff --git a/nedasm/Makefile b/nedasm/Makefile
index 93fd797..c842161 100644
--- a/nedasm/Makefile
+++ b/nedasm/Makefile
@@ -8,7 +8,7 @@ SRC != ls *.c
 all: nedasm
 
 nedasm:
-	$(CC) -o $@ $(SRC)
+	$(CC) $(CC_FLAGS) -o $@ $(SRC)
 
 clean:
 	@rm -f nedasm
diff --git a/neddis/Makefile b/neddis/Makefile
index b24f14e..ca679de 100644
--- a/neddis/Makefile
+++ b/neddis/Makefile
@@ -8,7 +8,7 @@ SRC != ls *.c
 all: neddis
 
 neddis:
-	$(CC) -o $@ $(SRC)
+	$(CC) $(CC_FLAGS) -o $@ $(SRC)
 
 clean:
 	@rm -f neddis
diff --git a/neddis/neddis.c b/neddis/neddis.c
index 306666e..957c56b 100644
--- a/neddis/neddis.c
+++ b/neddis/neddis.c
@@ -323,7 +323,7 @@ main(int argc, char ** argv)
     uint32_t offset = aout_exec.a_entry;
     /* Since all NED instructions are one word (4 bytes) wide, read in one word increments. */
     uint32_t i = 1;
-    while (i < text_segment[0]) {
+    while (i <= text_segment[0]) {
         if (display_labels) {
             for (uint32_t i=0; i < symbol_count; i++) {
                 if (offset == symbol_table[i].n_value) {
diff --git a/nedsim/Makefile b/nedsim/Makefile
index f34d74d..9ed1fe5 100644
--- a/nedsim/Makefile
+++ b/nedsim/Makefile
@@ -8,7 +8,7 @@ SRC != ls *.c
 all: nedsim
 
 nedsim:
-	$(CC) -o $@ $(SRC)
+	$(CC) $(CC_FLAGS) -o $@ $(SRC)
 
 clean:
 	@rm -f nedsim