... | ... |
@@ -65,7 +65,7 @@ echo "Assembling(asma).." |
65 | 65 |
./bin/uxnasm projects/software/asma.tal bin/asma.rom |
66 | 66 |
|
67 | 67 |
echo "Assembling(piano).." |
68 |
-echo projects/examples/demos/piano.tal | bin/uxncli bin/asma.rom > bin/piano.rom 2> bin/piano.log |
|
68 |
+bin/uxncli bin/asma.rom projects/examples/demos/piano.tal bin/piano.rom 2> bin/piano.log |
|
69 | 69 |
|
70 | 70 |
echo "Running.." |
71 | 71 |
./bin/uxnemu bin/piano.rom |
... | ... |
@@ -6,7 +6,7 @@ mkdir asma-test |
6 | 6 |
|
7 | 7 |
expect_failure() { |
8 | 8 |
cat > asma-test/in.tal |
9 |
- echo asma-test/in.tal | bin/uxncli asma-test/asma.rom > asma-test/out.rom 2> asma-test/asma.log |
|
9 |
+ bin/uxncli asma-test/asma.rom asma-test/in.tal asma-test/out.rom 2> asma-test/asma.log |
|
10 | 10 |
if ! grep -qF "${1}" asma-test/asma.log; then |
11 | 11 |
echo "error: asma didn't report error ${1} in faulty code" |
12 | 12 |
cat asma-test/asma.log |
... | ... |
@@ -27,7 +27,7 @@ for F in $(find projects -path projects/library -prune -false -or -type f -name |
27 | 27 |
xxd "${UASM_BASE}.rom" > "${UASM_BASE}.hex" |
28 | 28 |
|
29 | 29 |
ASMA_BASE="asma-test/asma-$(basename "${F%.tal}")" |
30 |
- echo "${F}" | bin/uxncli asma-test/asma.rom > "${ASMA_BASE}.rom" 2> "${ASMA_BASE}.log" |
|
30 |
+ bin/uxncli asma-test/asma.rom "${F}" "${ASMA_BASE}.rom" 2> "${ASMA_BASE}.log" |
|
31 | 31 |
if ! grep -qF 'bytes of heap used' "${ASMA_BASE}.log"; then |
32 | 32 |
echo "error: asma failed to assemble ${F}, while uxnasm succeeded" |
33 | 33 |
cat "${ASMA_BASE}.log" |
... | ... |
@@ -31,7 +31,12 @@ |
31 | 31 |
DUP EOR ( 00 ) |
32 | 32 |
;append-heap-byte JSR2 ( ) |
33 | 33 |
|
34 |
- ;asma-heap #0000 ;asma-assemble-file JSR2 |
|
34 |
+ ,&output-file LDR2 EOR ,&run JCN |
|
35 |
+ ;heap LDA2 ,&output-file STR2 |
|
36 |
+ BRK |
|
37 |
+ |
|
38 |
+ &run |
|
39 |
+ ;asma-heap LIT2 &output-file $2 ;asma-assemble-file JSR2 |
|
35 | 40 |
#01 .System/halt DEO |
36 | 41 |
BRK |
37 | 42 |
|