Fixed byte, string directives.

git-svn-id: http://www.cdkersey.com/harp/harptool@118 0246edb2-e076-4747-b392-db732a341fa2

src/test/Makefile

@@ -1,12 +1,15 @@
-HARPLD = ../harptool -L
-HARPAS = ../harptool -A
-HARPEM = ../harptool -E
-4BARCH = 4b16/16/2
+HARPLD  = ../harptool -L
+HARPAS  = ../harptool -A
+HARPEM  = ../harptool -E
+HARPDIS = ../harptool -D
+4BARCH  = 4b16/16/2
 
 all: simple.bin sieve.bin 2thread.bin simple.4b.bin sieve.4b.bin 2thread.4b.bin
 
 run: simple.out sieve.out 2thread.out simple.4b.out sieve.4b.out 2thread.4b.out
 
+disas: simple.d sieve.d 2thread.d simple.4b.d sieve.4b.d 2thread.4b.d
+
 %.4b.out : %.4b.bin
 	$(HARPEM) -a $(4BARCH) -c $< > $@
 
@@ -43,5 +46,11 @@ sieve.4b.bin : boot.4b.HOF lib.4b.HOF sieve.4b.HOF
 %.HOF : %.s
 	$(HARPAS) -o $@ $<
 
+%.4b.d : %.4b.HOF
+	$(HARPDIS) -o $@ --arch $(4BARCH) $<
+
+%.d : %.HOF
+	$(HARPDIS) -o $@ $<
+
 clean:
-	rm -f *.HOF *.bin *.out *~
+	rm -f *.HOF *.bin *.out *.d *~

src/test/sieve.s

@@ -78,10 +78,10 @@ loop4:       ld   %r1, %r0, array;
              trap; /* All traps currently cause a halt. */
 
 .perm rw /* TODO: How should I write section permissions? */
-.string hello "\"Harp!\" is how a harp seal says hello!\n"
-.string wrstr "Doing write\n"
-.string wrfin "Done write\n"
-.string xstr  "Exiting loop\n"
+hello:  .string "\"Harp!\" is how a harp seal says hello!\n"
+wrstr:  .string "Doing write\n"
+wrfin:  .string "Did write\n"
+xstr:   .string "Exiting loop\n"
 
 .global
 array: .space 0x1000 /* SIZE words of space. */

src/test/simple.s

@@ -18,5 +18,7 @@ entry:       ldi %r7, hello
              trap; /* All traps currently cause a halt. */
 
 .perm rw /* TODO: How should I write section permissions? */
-/* TODO: String literals! */
-.string hello "\"Harp!\" is how a harp seal says hello!\n"
+
+hello:
+.byte 0x22
+.string "Harp!\" is how a harp seal says hello!\n"