From: j8takagi Date: Fri, 5 Feb 2010 23:42:49 +0000 (+0900) Subject: dumpwordコマンド実行時やレジスタの内容を表示するときに、対応する文字を表示するよう仕様変更 X-Git-Tag: v0.1~64 X-Git-Url: http://j8takagi.net/cgi-bin/gitweb.cgi?p=YACASL2.git;a=commitdiff_plain;h=a901ac636091cc9d044a78525064b699ef7a2760 dumpwordコマンド実行時やレジスタの内容を表示するときに、対応する文字を表示するよう仕様変更 word.cにprint_dumpword関数追加 --- diff --git a/include/word.h b/include/word.h index 24dea80..6d83ef0 100644 --- a/include/word.h +++ b/include/word.h @@ -1,10 +1,13 @@ #ifndef YACASL2_WORD_H_INCLUDED #define YACASL2_WORD_H_INCLUDED +#include #include #include #include #include +#include + #include "cerr.h" /* WORD - 16ビットデータ型 */ @@ -25,4 +28,7 @@ char *word2n(WORD word); /* WORD値を2進数の文字列に変換 */ char *word2bit(const WORD word); +/* WORD値を解析して表示 */ +void print_dumpword(WORD word, bool logicalmode); + #endif diff --git a/src/casl2.c b/src/casl2.c index 85a3ab5..1b438e5 100644 --- a/src/casl2.c +++ b/src/casl2.c @@ -4,8 +4,7 @@ #define _GNU_SOURCE #include -static struct option longopts[] = -{ +static struct option longopts[] = { {"source", no_argument, NULL, 's'}, {"label", no_argument, NULL, 'l'}, {"labelonly", no_argument, NULL, 'L'}, diff --git a/src/dump.c b/src/dump.c index 8fab87d..c1184be 100644 --- a/src/dump.c +++ b/src/dump.c @@ -31,13 +31,8 @@ void dspregister() { int i; for(i = 0; i < REGSIZE; i++ ) { - if((&execmode)->logicalmode == true) { - fprintf(stdout, "#%04X: GR%d: %6d = #%04X = %s\n", - PR, i, GR[i], GR[i], word2bit(GR[i])); - } else { - fprintf(stdout, "#%04X: GR%d: %6d = #%04X = %s\n", - PR, i, (short)GR[i], GR[i], word2bit(GR[i])); - } + fprintf(stdout, "#%04X: GR%d: ", PR, i); + print_dumpword(GR[i], (&execmode)->logicalmode); } fprintf(stdout, "#%04X: SP: %6d = #%04X = %s\n", PR, SP, SP, word2bit(SP)); fprintf(stdout, "#%04X: PR: %6d = #%04X = %s\n", PR, PR, PR, word2bit(PR)); diff --git a/src/dumpword.c b/src/dumpword.c index 7544f25..a3c6a36 100644 --- a/src/dumpword.c +++ b/src/dumpword.c @@ -47,10 +47,7 @@ int main(int argc, char *argv[]) fprintf(stderr, "Dumpword Error - %d: %s\n", cerrno, cerrmsg); exit(-1); } - if(logicalmode == true) { - fprintf(stdout, "%6s: %6d = #%04X = %s\n", argv[optind], word, word, word2bit(word)); - } else { - fprintf(stdout, "%6s: %6d = #%04X = %s\n", argv[optind], (short)word, word, word2bit(word)); - } + fprintf(stdout, "%6s: ", argv[optind]); + print_dumpword(word, logicalmode); return 0; } diff --git a/src/exec.c b/src/exec.c index ec9687f..748c72b 100644 --- a/src/exec.c +++ b/src/exec.c @@ -30,20 +30,20 @@ void svcin() void svcout() { int i; - char c; + WORD w; for(i = 0; i < GR[2]; i++) { if(GR[1] + i >= memsize - 1) { setcerr(203, NULL); /* SVC output - out of Comet II memory */ return; } - if(memory[GR[1]+i] == '\0') { + if((w = memory[GR[1]+i]) == '\0') { break; } /* 「文字の組」の符号表に記載された文字と、改行（CR）／タブを表示 */ /* それ以外の文字は、「.」で表す */ - if(((c = (char)(memory[GR[1]+i])) >= 0x20 && c <= 0x7E) || c == 0xA || c == '\t') { - putchar(c); + if((w >= 0x20 && w <= 0x7E) || w == 0xA || w == '\t') { + putchar((char)w); } else { putchar('.'); } diff --git a/src/word.c b/src/word.c index 0e80452..655e766 100644 --- a/src/word.c +++ b/src/word.c @@ -83,3 +83,23 @@ char *word2bit(const WORD word) *p = '\0'; return bit; } + +/* WORD値を解析して表示 */ +void print_dumpword(WORD word, bool logicalmode) +{ + if(logicalmode == true) { + fprintf(stdout, "%6d", word); + } else { + fprintf(stdout, "%6d", (signed short)word); + } + fprintf(stdout, " = #%04X = %s", word, word2bit(word)); + /* 「文字の組」の符号表に記載された文字と、改行（CR）／タブを表示 */ + if(word >= 0x20 && word <= 0x7E) { + fprintf(stdout, " = \'%c\'", word); + } else if(word == 0xA) { + fprintf(stdout, " = \'\\n\'"); + } else if(word == '\t') { + fprintf(stdout, " = \'\\t\'"); + } + fprintf(stdout, "\n"); +} diff --git a/test/integration/casl2/and1/0.txt b/test/integration/casl2/and1/0.txt index cb78020..39341e1 100644 --- a/test/integration/casl2/and1/0.txt +++ b/test/integration/casl2/and1/0.txt @@ -123,7 +123,7 @@ Executing machine codes #0002: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0004: Register:::: -#0004: GR0: 68 = #0044 = 0000000001000100 +#0004: GR0: 68 = #0044 = 0000000001000100 = 'D' #0004: GR1: 0 = #0000 = 0000000000000000 #0004: GR2: 0 = #0000 = 0000000000000000 #0004: GR3: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/and2/0.txt b/test/integration/casl2/and2/0.txt index 5a4e795..33a6ad9 100644 --- a/test/integration/casl2/and2/0.txt +++ b/test/integration/casl2/and2/0.txt @@ -120,7 +120,7 @@ Executing machine codes #0002: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0004: Register:::: -#0004: GR0: 68 = #0044 = 0000000001000100 +#0004: GR0: 68 = #0044 = 0000000001000100 = 'D' #0004: GR1: 0 = #0000 = 0000000000000000 #0004: GR2: 0 = #0000 = 0000000000000000 #0004: GR3: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/and3/0.txt b/test/integration/casl2/and3/0.txt index 8d242d7..48b94c0 100644 --- a/test/integration/casl2/and3/0.txt +++ b/test/integration/casl2/and3/0.txt @@ -120,7 +120,7 @@ Executing machine codes #0002: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0004: Register:::: -#0004: GR0: 96 = #0060 = 0000000001100000 +#0004: GR0: 96 = #0060 = 0000000001100000 = '`' #0004: GR1: 0 = #0000 = 0000000000000000 #0004: GR2: 0 = #0000 = 0000000000000000 #0004: GR3: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/lad2/0.txt b/test/integration/casl2/lad2/0.txt index 2a727f9..58bd700 100644 --- a/test/integration/casl2/lad2/0.txt +++ b/test/integration/casl2/lad2/0.txt @@ -72,7 +72,7 @@ Executing machine codes #0002: Register:::: #0002: GR0: 0 = #0000 = 0000000000000000 -#0002: GR1: 10 = #000A = 0000000000001010 +#0002: GR1: 10 = #000A = 0000000000001010 = '\n' #0002: GR2: 0 = #0000 = 0000000000000000 #0002: GR3: 0 = #0000 = 0000000000000000 #0002: GR4: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/literal_spc/0.txt b/test/integration/casl2/literal_spc/0.txt index 656effb..8afb623 100644 --- a/test/integration/casl2/literal_spc/0.txt +++ b/test/integration/casl2/literal_spc/0.txt @@ -104,7 +104,7 @@ Executing machine codes #0002: Register:::: #0002: GR0: 0 = #0000 = 0000000000000000 -#0002: GR1: 32 = #0020 = 0000000000100000 +#0002: GR1: 32 = #0020 = 0000000000100000 = ' ' #0002: GR2: 0 = #0000 = 0000000000000000 #0002: GR3: 0 = #0000 = 0000000000000000 #0002: GR4: 0 = #0000 = 0000000000000000 @@ -151,7 +151,7 @@ Executing machine codes #0004: Register:::: #0004: GR0: 0 = #0000 = 0000000000000000 -#0004: GR1: 32 = #0020 = 0000000000100000 +#0004: GR1: 32 = #0020 = 0000000000100000 = ' ' #0004: GR2: 0 = #0000 = 0000000000000000 #0004: GR3: 0 = #0000 = 0000000000000000 #0004: GR4: 0 = #0000 = 0000000000000000 @@ -198,7 +198,7 @@ Executing machine codes #0006: Register:::: #0006: GR0: 0 = #0000 = 0000000000000000 -#0006: GR1: 32 = #0020 = 0000000000100000 +#0006: GR1: 32 = #0020 = 0000000000100000 = ' ' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -245,7 +245,7 @@ Executing machine codes #0008: Register:::: #0008: GR0: 0 = #0000 = 0000000000000000 -#0008: GR1: 32 = #0020 = 0000000000100000 +#0008: GR1: 32 = #0020 = 0000000000100000 = ' ' #0008: GR2: 0 = #0000 = 0000000000000000 #0008: GR3: 0 = #0000 = 0000000000000000 #0008: GR4: 0 = #0000 = 0000000000000000 @@ -622,7 +622,7 @@ Executing machine codes #0016: Register:::: #0016: GR0: 0 = #0000 = 0000000000000000 -#0016: GR1: 32 = #0020 = 0000000000100000 +#0016: GR1: 32 = #0020 = 0000000000100000 = ' ' #0016: GR2: 0 = #0000 = 0000000000000000 #0016: GR3: 0 = #0000 = 0000000000000000 #0016: GR4: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/literalstr/0.txt b/test/integration/casl2/literalstr/0.txt index 46179ba..ed34fe6 100644 --- a/test/integration/casl2/literalstr/0.txt +++ b/test/integration/casl2/literalstr/0.txt @@ -158,7 +158,7 @@ Executing machine codes #0004: Register:::: #0004: GR0: 0 = #0000 = 0000000000000000 #0004: GR1: 20 = #0014 = 0000000000010100 -#0004: GR2: 10 = #000A = 0000000000001010 +#0004: GR2: 10 = #000A = 0000000000001010 = '\n' #0004: GR3: 0 = #0000 = 0000000000000000 #0004: GR4: 0 = #0000 = 0000000000000000 #0004: GR5: 0 = #0000 = 0000000000000000 @@ -205,7 +205,7 @@ Executing machine codes #0006: Register:::: #0006: GR0: 0 = #0000 = 0000000000000000 #0006: GR1: 20 = #0014 = 0000000000010100 -#0006: GR2: 10 = #000A = 0000000000001010 +#0006: GR2: 10 = #000A = 0000000000001010 = '\n' #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 #0006: GR5: 0 = #0000 = 0000000000000000 @@ -252,7 +252,7 @@ Executing machine codes #0008: Register:::: #0008: GR0: 0 = #0000 = 0000000000000000 #0008: GR1: 20 = #0014 = 0000000000010100 -#0008: GR2: 10 = #000A = 0000000000001010 +#0008: GR2: 10 = #000A = 0000000000001010 = '\n' #0008: GR3: 0 = #0000 = 0000000000000000 #0008: GR4: 0 = #0000 = 0000000000000000 #0008: GR5: 0 = #0000 = 0000000000000000 @@ -299,7 +299,7 @@ Executing machine codes #000A: Register:::: #000A: GR0: 0 = #0000 = 0000000000000000 #000A: GR1: 20 = #0014 = 0000000000010100 -#000A: GR2: 10 = #000A = 0000000000001010 +#000A: GR2: 10 = #000A = 0000000000001010 = '\n' #000A: GR3: 0 = #0000 = 0000000000000000 #000A: GR4: 0 = #0000 = 0000000000000000 #000A: GR5: 0 = #0000 = 0000000000000000 @@ -346,8 +346,8 @@ Executing machine codes #000C: Register:::: #000C: GR0: 0 = #0000 = 0000000000000000 #000C: GR1: 20 = #0014 = 0000000000010100 -#000C: GR2: 10 = #000A = 0000000000001010 -#000C: GR3: 97 = #0061 = 0000000001100001 +#000C: GR2: 10 = #000A = 0000000000001010 = '\n' +#000C: GR3: 97 = #0061 = 0000000001100001 = 'a' #000C: GR4: 0 = #0000 = 0000000000000000 #000C: GR5: 0 = #0000 = 0000000000000000 #000C: GR6: 0 = #0000 = 0000000000000000 @@ -393,8 +393,8 @@ Executing machine codes #000E: Register:::: #000E: GR0: 0 = #0000 = 0000000000000000 #000E: GR1: 21 = #0015 = 0000000000010101 -#000E: GR2: 10 = #000A = 0000000000001010 -#000E: GR3: 97 = #0061 = 0000000001100001 +#000E: GR2: 10 = #000A = 0000000000001010 = '\n' +#000E: GR3: 97 = #0061 = 0000000001100001 = 'a' #000E: GR4: 0 = #0000 = 0000000000000000 #000E: GR5: 0 = #0000 = 0000000000000000 #000E: GR6: 0 = #0000 = 0000000000000000 @@ -440,8 +440,8 @@ Executing machine codes #0010: Register:::: #0010: GR0: 0 = #0000 = 0000000000000000 #0010: GR1: 21 = #0015 = 0000000000010101 -#0010: GR2: 9 = #0009 = 0000000000001001 -#0010: GR3: 97 = #0061 = 0000000001100001 +#0010: GR2: 9 = #0009 = 0000000000001001 = '\t' +#0010: GR3: 97 = #0061 = 0000000001100001 = 'a' #0010: GR4: 0 = #0000 = 0000000000000000 #0010: GR5: 0 = #0000 = 0000000000000000 #0010: GR6: 0 = #0000 = 0000000000000000 @@ -487,8 +487,8 @@ Executing machine codes #0004: Register:::: #0004: GR0: 0 = #0000 = 0000000000000000 #0004: GR1: 21 = #0015 = 0000000000010101 -#0004: GR2: 9 = #0009 = 0000000000001001 -#0004: GR3: 97 = #0061 = 0000000001100001 +#0004: GR2: 9 = #0009 = 0000000000001001 = '\t' +#0004: GR3: 97 = #0061 = 0000000001100001 = 'a' #0004: GR4: 0 = #0000 = 0000000000000000 #0004: GR5: 0 = #0000 = 0000000000000000 #0004: GR6: 0 = #0000 = 0000000000000000 @@ -534,8 +534,8 @@ Executing machine codes #0006: Register:::: #0006: GR0: 0 = #0000 = 0000000000000000 #0006: GR1: 21 = #0015 = 0000000000010101 -#0006: GR2: 9 = #0009 = 0000000000001001 -#0006: GR3: 97 = #0061 = 0000000001100001 +#0006: GR2: 9 = #0009 = 0000000000001001 = '\t' +#0006: GR3: 97 = #0061 = 0000000001100001 = 'a' #0006: GR4: 0 = #0000 = 0000000000000000 #0006: GR5: 0 = #0000 = 0000000000000000 #0006: GR6: 0 = #0000 = 0000000000000000 @@ -581,8 +581,8 @@ Executing machine codes #0008: Register:::: #0008: GR0: 0 = #0000 = 0000000000000000 #0008: GR1: 21 = #0015 = 0000000000010101 -#0008: GR2: 9 = #0009 = 0000000000001001 -#0008: GR3: 97 = #0061 = 0000000001100001 +#0008: GR2: 9 = #0009 = 0000000000001001 = '\t' +#0008: GR3: 97 = #0061 = 0000000001100001 = 'a' #0008: GR4: 0 = #0000 = 0000000000000000 #0008: GR5: 0 = #0000 = 0000000000000000 #0008: GR6: 0 = #0000 = 0000000000000000 @@ -628,8 +628,8 @@ Executing machine codes #000A: Register:::: #000A: GR0: 0 = #0000 = 0000000000000000 #000A: GR1: 21 = #0015 = 0000000000010101 -#000A: GR2: 9 = #0009 = 0000000000001001 -#000A: GR3: 97 = #0061 = 0000000001100001 +#000A: GR2: 9 = #0009 = 0000000000001001 = '\t' +#000A: GR3: 97 = #0061 = 0000000001100001 = 'a' #000A: GR4: 0 = #0000 = 0000000000000000 #000A: GR5: 0 = #0000 = 0000000000000000 #000A: GR6: 0 = #0000 = 0000000000000000 @@ -675,7 +675,7 @@ Executing machine codes #000C: Register:::: #000C: GR0: 0 = #0000 = 0000000000000000 #000C: GR1: 21 = #0015 = 0000000000010101 -#000C: GR2: 9 = #0009 = 0000000000001001 +#000C: GR2: 9 = #0009 = 0000000000001001 = '\t' #000C: GR3: 0 = #0000 = 0000000000000000 #000C: GR4: 0 = #0000 = 0000000000000000 #000C: GR5: 0 = #0000 = 0000000000000000 @@ -722,7 +722,7 @@ Executing machine codes #000E: Register:::: #000E: GR0: 0 = #0000 = 0000000000000000 #000E: GR1: 22 = #0016 = 0000000000010110 -#000E: GR2: 9 = #0009 = 0000000000001001 +#000E: GR2: 9 = #0009 = 0000000000001001 = '\t' #000E: GR3: 0 = #0000 = 0000000000000000 #000E: GR4: 0 = #0000 = 0000000000000000 #000E: GR5: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/out1/0.txt b/test/integration/casl2/out1/0.txt index 5fce11c..c26db15 100644 --- a/test/integration/casl2/out1/0.txt +++ b/test/integration/casl2/out1/0.txt @@ -347,7 +347,7 @@ asqwerty111111. #000C: Register:::: #000C: GR0: 0 = #0000 = 0000000000000000 -#000C: GR1: 42 = #002A = 0000000000101010 +#000C: GR1: 42 = #002A = 0000000000101010 = '*' #000C: GR2: 24 = #0018 = 0000000000011000 #000C: GR3: 0 = #0000 = 0000000000000000 #000C: GR4: 0 = #0000 = 0000000000000000 @@ -394,7 +394,7 @@ asqwerty111111. #000E: Register:::: #000E: GR0: 0 = #0000 = 0000000000000000 -#000E: GR1: 42 = #002A = 0000000000101010 +#000E: GR1: 42 = #002A = 0000000000101010 = '*' #000E: GR2: 1 = #0001 = 0000000000000001 #000E: GR3: 0 = #0000 = 0000000000000000 #000E: GR4: 0 = #0000 = 0000000000000000 @@ -442,7 +442,7 @@ asqwerty111111. #0010: Register:::: #0010: GR0: 0 = #0000 = 0000000000000000 -#0010: GR1: 42 = #002A = 0000000000101010 +#0010: GR1: 42 = #002A = 0000000000101010 = '*' #0010: GR2: 1 = #0001 = 0000000000000001 #0010: GR3: 0 = #0000 = 0000000000000000 #0010: GR4: 0 = #0000 = 0000000000000000 @@ -489,7 +489,7 @@ asqwerty111111. #0011: Register:::: #0011: GR0: 0 = #0000 = 0000000000000000 -#0011: GR1: 42 = #002A = 0000000000101010 +#0011: GR1: 42 = #002A = 0000000000101010 = '*' #0011: GR2: 0 = #0000 = 0000000000000000 #0011: GR3: 0 = #0000 = 0000000000000000 #0011: GR4: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/sra2/0.txt b/test/integration/casl2/sra2/0.txt index 78c24e8..c389480 100644 --- a/test/integration/casl2/sra2/0.txt +++ b/test/integration/casl2/sra2/0.txt @@ -76,7 +76,7 @@ Executing machine codes #0002: GR1: 0 = #0000 = 0000000000000000 #0002: GR2: 0 = #0000 = 0000000000000000 #0002: GR3: 0 = #0000 = 0000000000000000 -#0002: GR4: 124 = #007C = 0000000001111100 +#0002: GR4: 124 = #007C = 0000000001111100 = '|' #0002: GR5: 0 = #0000 = 0000000000000000 #0002: GR6: 0 = #0000 = 0000000000000000 #0002: GR7: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/sum_10_slaoT/0.txt b/test/integration/casl2/sum_10_slaoT/0.txt index 8cbc32a..d0e4b7a 100644 --- a/test/integration/casl2/sum_10_slaoT/0.txt +++ b/test/integration/casl2/sum_10_slaoT/0.txt @@ -315,7 +315,7 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 10 = #000A = 0000000000001010 +#0007: GR0: 10 = #000A = 0000000000001010 = '\n' #0007: GR1: 4 = #0004 = 0000000000000100 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -328,7 +328,7 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 10 = #000A = 0000000000001010 +#0009: GR0: 10 = #000A = 0000000000001010 = '\n' #0009: GR1: 5 = #0005 = 0000000000000101 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -341,7 +341,7 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 10 = #000A = 0000000000001010 +#000B: GR0: 10 = #000A = 0000000000001010 = '\n' #000B: GR1: 5 = #0005 = 0000000000000101 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -354,7 +354,7 @@ Executing machine codes #000B: FR (OF SF ZF): 010 #000D: Register:::: -#000D: GR0: 10 = #000A = 0000000000001010 +#000D: GR0: 10 = #000A = 0000000000001010 = '\n' #000D: GR1: 5 = #0005 = 0000000000000101 #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 @@ -367,7 +367,7 @@ Executing machine codes #000D: FR (OF SF ZF): 010 #0006: Register:::: -#0006: GR0: 10 = #000A = 0000000000001010 +#0006: GR0: 10 = #000A = 0000000000001010 = '\n' #0006: GR1: 5 = #0005 = 0000000000000101 #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 @@ -575,7 +575,7 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 36 = #0024 = 0000000000100100 +#0007: GR0: 36 = #0024 = 0000000000100100 = '$' #0007: GR1: 8 = #0008 = 0000000000001000 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -588,8 +588,8 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 36 = #0024 = 0000000000100100 -#0009: GR1: 9 = #0009 = 0000000000001001 +#0009: GR0: 36 = #0024 = 0000000000100100 = '$' +#0009: GR1: 9 = #0009 = 0000000000001001 = '\t' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -601,8 +601,8 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 36 = #0024 = 0000000000100100 -#000B: GR1: 9 = #0009 = 0000000000001001 +#000B: GR0: 36 = #0024 = 0000000000100100 = '$' +#000B: GR1: 9 = #0009 = 0000000000001001 = '\t' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -614,8 +614,8 @@ Executing machine codes #000B: FR (OF SF ZF): 010 #000D: Register:::: -#000D: GR0: 36 = #0024 = 0000000000100100 -#000D: GR1: 9 = #0009 = 0000000000001001 +#000D: GR0: 36 = #0024 = 0000000000100100 = '$' +#000D: GR1: 9 = #0009 = 0000000000001001 = '\t' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -627,8 +627,8 @@ Executing machine codes #000D: FR (OF SF ZF): 010 #0006: Register:::: -#0006: GR0: 36 = #0024 = 0000000000100100 -#0006: GR1: 9 = #0009 = 0000000000001001 +#0006: GR0: 36 = #0024 = 0000000000100100 = '$' +#0006: GR1: 9 = #0009 = 0000000000001001 = '\t' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -640,8 +640,8 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 45 = #002D = 0000000000101101 -#0007: GR1: 9 = #0009 = 0000000000001001 +#0007: GR0: 45 = #002D = 0000000000101101 = '-' +#0007: GR1: 9 = #0009 = 0000000000001001 = '\t' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -653,8 +653,8 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 45 = #002D = 0000000000101101 -#0009: GR1: 10 = #000A = 0000000000001010 +#0009: GR0: 45 = #002D = 0000000000101101 = '-' +#0009: GR1: 10 = #000A = 0000000000001010 = '\n' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -666,8 +666,8 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 45 = #002D = 0000000000101101 -#000B: GR1: 10 = #000A = 0000000000001010 +#000B: GR0: 45 = #002D = 0000000000101101 = '-' +#000B: GR1: 10 = #000A = 0000000000001010 = '\n' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -679,8 +679,8 @@ Executing machine codes #000B: FR (OF SF ZF): 001 #000D: Register:::: -#000D: GR0: 45 = #002D = 0000000000101101 -#000D: GR1: 10 = #000A = 0000000000001010 +#000D: GR0: 45 = #002D = 0000000000101101 = '-' +#000D: GR1: 10 = #000A = 0000000000001010 = '\n' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -692,8 +692,8 @@ Executing machine codes #000D: FR (OF SF ZF): 001 #0006: Register:::: -#0006: GR0: 45 = #002D = 0000000000101101 -#0006: GR1: 10 = #000A = 0000000000001010 +#0006: GR0: 45 = #002D = 0000000000101101 = '-' +#0006: GR1: 10 = #000A = 0000000000001010 = '\n' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -705,8 +705,8 @@ Executing machine codes #0006: FR (OF SF ZF): 001 #0007: Register:::: -#0007: GR0: 55 = #0037 = 0000000000110111 -#0007: GR1: 10 = #000A = 0000000000001010 +#0007: GR0: 55 = #0037 = 0000000000110111 = '7' +#0007: GR1: 10 = #000A = 0000000000001010 = '\n' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -718,7 +718,7 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 55 = #0037 = 0000000000110111 +#0009: GR0: 55 = #0037 = 0000000000110111 = '7' #0009: GR1: 11 = #000B = 0000000000001011 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -731,7 +731,7 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 55 = #0037 = 0000000000110111 +#000B: GR0: 55 = #0037 = 0000000000110111 = '7' #000B: GR1: 11 = #000B = 0000000000001011 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -744,7 +744,7 @@ Executing machine codes #000B: FR (OF SF ZF): 000 #000F: Register:::: -#000F: GR0: 55 = #0037 = 0000000000110111 +#000F: GR0: 55 = #0037 = 0000000000110111 = '7' #000F: GR1: 11 = #000B = 0000000000001011 #000F: GR2: 0 = #0000 = 0000000000000000 #000F: GR3: 0 = #0000 = 0000000000000000 @@ -757,7 +757,7 @@ Executing machine codes #000F: FR (OF SF ZF): 000 #0010: Register:::: -#0010: GR0: 55 = #0037 = 0000000000110111 +#0010: GR0: 55 = #0037 = 0000000000110111 = '7' #0010: GR1: 0 = #0000 = 0000000000000000 #0010: GR2: 0 = #0000 = 0000000000000000 #0010: GR3: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/sum_10_slaot/0.txt b/test/integration/casl2/sum_10_slaot/0.txt index fe4bd8f..f3432a8 100644 --- a/test/integration/casl2/sum_10_slaot/0.txt +++ b/test/integration/casl2/sum_10_slaot/0.txt @@ -315,7 +315,7 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 10 = #000A = 0000000000001010 +#0007: GR0: 10 = #000A = 0000000000001010 = '\n' #0007: GR1: 4 = #0004 = 0000000000000100 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -328,7 +328,7 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 10 = #000A = 0000000000001010 +#0009: GR0: 10 = #000A = 0000000000001010 = '\n' #0009: GR1: 5 = #0005 = 0000000000000101 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -341,7 +341,7 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 10 = #000A = 0000000000001010 +#000B: GR0: 10 = #000A = 0000000000001010 = '\n' #000B: GR1: 5 = #0005 = 0000000000000101 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -354,7 +354,7 @@ Executing machine codes #000B: FR (OF SF ZF): 010 #000D: Register:::: -#000D: GR0: 10 = #000A = 0000000000001010 +#000D: GR0: 10 = #000A = 0000000000001010 = '\n' #000D: GR1: 5 = #0005 = 0000000000000101 #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 @@ -367,7 +367,7 @@ Executing machine codes #000D: FR (OF SF ZF): 010 #0006: Register:::: -#0006: GR0: 10 = #000A = 0000000000001010 +#0006: GR0: 10 = #000A = 0000000000001010 = '\n' #0006: GR1: 5 = #0005 = 0000000000000101 #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 @@ -575,7 +575,7 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 36 = #0024 = 0000000000100100 +#0007: GR0: 36 = #0024 = 0000000000100100 = '$' #0007: GR1: 8 = #0008 = 0000000000001000 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -588,8 +588,8 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 36 = #0024 = 0000000000100100 -#0009: GR1: 9 = #0009 = 0000000000001001 +#0009: GR0: 36 = #0024 = 0000000000100100 = '$' +#0009: GR1: 9 = #0009 = 0000000000001001 = '\t' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -601,8 +601,8 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 36 = #0024 = 0000000000100100 -#000B: GR1: 9 = #0009 = 0000000000001001 +#000B: GR0: 36 = #0024 = 0000000000100100 = '$' +#000B: GR1: 9 = #0009 = 0000000000001001 = '\t' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -614,8 +614,8 @@ Executing machine codes #000B: FR (OF SF ZF): 010 #000D: Register:::: -#000D: GR0: 36 = #0024 = 0000000000100100 -#000D: GR1: 9 = #0009 = 0000000000001001 +#000D: GR0: 36 = #0024 = 0000000000100100 = '$' +#000D: GR1: 9 = #0009 = 0000000000001001 = '\t' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -627,8 +627,8 @@ Executing machine codes #000D: FR (OF SF ZF): 010 #0006: Register:::: -#0006: GR0: 36 = #0024 = 0000000000100100 -#0006: GR1: 9 = #0009 = 0000000000001001 +#0006: GR0: 36 = #0024 = 0000000000100100 = '$' +#0006: GR1: 9 = #0009 = 0000000000001001 = '\t' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -640,8 +640,8 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 45 = #002D = 0000000000101101 -#0007: GR1: 9 = #0009 = 0000000000001001 +#0007: GR0: 45 = #002D = 0000000000101101 = '-' +#0007: GR1: 9 = #0009 = 0000000000001001 = '\t' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -653,8 +653,8 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 45 = #002D = 0000000000101101 -#0009: GR1: 10 = #000A = 0000000000001010 +#0009: GR0: 45 = #002D = 0000000000101101 = '-' +#0009: GR1: 10 = #000A = 0000000000001010 = '\n' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -666,8 +666,8 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 45 = #002D = 0000000000101101 -#000B: GR1: 10 = #000A = 0000000000001010 +#000B: GR0: 45 = #002D = 0000000000101101 = '-' +#000B: GR1: 10 = #000A = 0000000000001010 = '\n' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -679,8 +679,8 @@ Executing machine codes #000B: FR (OF SF ZF): 001 #000D: Register:::: -#000D: GR0: 45 = #002D = 0000000000101101 -#000D: GR1: 10 = #000A = 0000000000001010 +#000D: GR0: 45 = #002D = 0000000000101101 = '-' +#000D: GR1: 10 = #000A = 0000000000001010 = '\n' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -692,8 +692,8 @@ Executing machine codes #000D: FR (OF SF ZF): 001 #0006: Register:::: -#0006: GR0: 45 = #002D = 0000000000101101 -#0006: GR1: 10 = #000A = 0000000000001010 +#0006: GR0: 45 = #002D = 0000000000101101 = '-' +#0006: GR1: 10 = #000A = 0000000000001010 = '\n' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -705,8 +705,8 @@ Executing machine codes #0006: FR (OF SF ZF): 001 #0007: Register:::: -#0007: GR0: 55 = #0037 = 0000000000110111 -#0007: GR1: 10 = #000A = 0000000000001010 +#0007: GR0: 55 = #0037 = 0000000000110111 = '7' +#0007: GR1: 10 = #000A = 0000000000001010 = '\n' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -718,7 +718,7 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 55 = #0037 = 0000000000110111 +#0009: GR0: 55 = #0037 = 0000000000110111 = '7' #0009: GR1: 11 = #000B = 0000000000001011 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -731,7 +731,7 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 55 = #0037 = 0000000000110111 +#000B: GR0: 55 = #0037 = 0000000000110111 = '7' #000B: GR1: 11 = #000B = 0000000000001011 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -744,7 +744,7 @@ Executing machine codes #000B: FR (OF SF ZF): 000 #000F: Register:::: -#000F: GR0: 55 = #0037 = 0000000000110111 +#000F: GR0: 55 = #0037 = 0000000000110111 = '7' #000F: GR1: 11 = #000B = 0000000000001011 #000F: GR2: 0 = #0000 = 0000000000000000 #000F: GR3: 0 = #0000 = 0000000000000000 @@ -757,7 +757,7 @@ Executing machine codes #000F: FR (OF SF ZF): 000 #0010: Register:::: -#0010: GR0: 55 = #0037 = 0000000000110111 +#0010: GR0: 55 = #0037 = 0000000000110111 = '7' #0010: GR1: 0 = #0000 = 0000000000000000 #0010: GR2: 0 = #0000 = 0000000000000000 #0010: GR3: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/sum_10_slaotd/0.txt b/test/integration/casl2/sum_10_slaotd/0.txt index 96961ae..5513c03 100644 --- a/test/integration/casl2/sum_10_slaotd/0.txt +++ b/test/integration/casl2/sum_10_slaotd/0.txt @@ -961,7 +961,7 @@ Executing machine codes #0006: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0007: Register:::: -#0007: GR0: 10 = #000A = 0000000000001010 +#0007: GR0: 10 = #000A = 0000000000001010 = '\n' #0007: GR1: 4 = #0004 = 0000000000000100 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -1008,7 +1008,7 @@ Executing machine codes #0007: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0009: Register:::: -#0009: GR0: 10 = #000A = 0000000000001010 +#0009: GR0: 10 = #000A = 0000000000001010 = '\n' #0009: GR1: 5 = #0005 = 0000000000000101 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -1055,7 +1055,7 @@ Executing machine codes #0009: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000B: Register:::: -#000B: GR0: 10 = #000A = 0000000000001010 +#000B: GR0: 10 = #000A = 0000000000001010 = '\n' #000B: GR1: 5 = #0005 = 0000000000000101 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -1102,7 +1102,7 @@ Executing machine codes #000B: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000D: Register:::: -#000D: GR0: 10 = #000A = 0000000000001010 +#000D: GR0: 10 = #000A = 0000000000001010 = '\n' #000D: GR1: 5 = #0005 = 0000000000000101 #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 @@ -1149,7 +1149,7 @@ Executing machine codes #000D: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0006: Register:::: -#0006: GR0: 10 = #000A = 0000000000001010 +#0006: GR0: 10 = #000A = 0000000000001010 = '\n' #0006: GR1: 5 = #0005 = 0000000000000101 #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 @@ -1901,7 +1901,7 @@ Executing machine codes #0006: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0007: Register:::: -#0007: GR0: 36 = #0024 = 0000000000100100 +#0007: GR0: 36 = #0024 = 0000000000100100 = '$' #0007: GR1: 8 = #0008 = 0000000000001000 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -1948,8 +1948,8 @@ Executing machine codes #0007: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0009: Register:::: -#0009: GR0: 36 = #0024 = 0000000000100100 -#0009: GR1: 9 = #0009 = 0000000000001001 +#0009: GR0: 36 = #0024 = 0000000000100100 = '$' +#0009: GR1: 9 = #0009 = 0000000000001001 = '\t' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -1995,8 +1995,8 @@ Executing machine codes #0009: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000B: Register:::: -#000B: GR0: 36 = #0024 = 0000000000100100 -#000B: GR1: 9 = #0009 = 0000000000001001 +#000B: GR0: 36 = #0024 = 0000000000100100 = '$' +#000B: GR1: 9 = #0009 = 0000000000001001 = '\t' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -2042,8 +2042,8 @@ Executing machine codes #000B: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000D: Register:::: -#000D: GR0: 36 = #0024 = 0000000000100100 -#000D: GR1: 9 = #0009 = 0000000000001001 +#000D: GR0: 36 = #0024 = 0000000000100100 = '$' +#000D: GR1: 9 = #0009 = 0000000000001001 = '\t' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -2089,8 +2089,8 @@ Executing machine codes #000D: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0006: Register:::: -#0006: GR0: 36 = #0024 = 0000000000100100 -#0006: GR1: 9 = #0009 = 0000000000001001 +#0006: GR0: 36 = #0024 = 0000000000100100 = '$' +#0006: GR1: 9 = #0009 = 0000000000001001 = '\t' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -2136,8 +2136,8 @@ Executing machine codes #0006: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0007: Register:::: -#0007: GR0: 45 = #002D = 0000000000101101 -#0007: GR1: 9 = #0009 = 0000000000001001 +#0007: GR0: 45 = #002D = 0000000000101101 = '-' +#0007: GR1: 9 = #0009 = 0000000000001001 = '\t' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -2183,8 +2183,8 @@ Executing machine codes #0007: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0009: Register:::: -#0009: GR0: 45 = #002D = 0000000000101101 -#0009: GR1: 10 = #000A = 0000000000001010 +#0009: GR0: 45 = #002D = 0000000000101101 = '-' +#0009: GR1: 10 = #000A = 0000000000001010 = '\n' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -2230,8 +2230,8 @@ Executing machine codes #0009: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000B: Register:::: -#000B: GR0: 45 = #002D = 0000000000101101 -#000B: GR1: 10 = #000A = 0000000000001010 +#000B: GR0: 45 = #002D = 0000000000101101 = '-' +#000B: GR1: 10 = #000A = 0000000000001010 = '\n' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -2277,8 +2277,8 @@ Executing machine codes #000B: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000D: Register:::: -#000D: GR0: 45 = #002D = 0000000000101101 -#000D: GR1: 10 = #000A = 0000000000001010 +#000D: GR0: 45 = #002D = 0000000000101101 = '-' +#000D: GR1: 10 = #000A = 0000000000001010 = '\n' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -2324,8 +2324,8 @@ Executing machine codes #000D: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0006: Register:::: -#0006: GR0: 45 = #002D = 0000000000101101 -#0006: GR1: 10 = #000A = 0000000000001010 +#0006: GR0: 45 = #002D = 0000000000101101 = '-' +#0006: GR1: 10 = #000A = 0000000000001010 = '\n' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -2371,8 +2371,8 @@ Executing machine codes #0006: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0007: Register:::: -#0007: GR0: 55 = #0037 = 0000000000110111 -#0007: GR1: 10 = #000A = 0000000000001010 +#0007: GR0: 55 = #0037 = 0000000000110111 = '7' +#0007: GR1: 10 = #000A = 0000000000001010 = '\n' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -2418,7 +2418,7 @@ Executing machine codes #0007: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0009: Register:::: -#0009: GR0: 55 = #0037 = 0000000000110111 +#0009: GR0: 55 = #0037 = 0000000000110111 = '7' #0009: GR1: 11 = #000B = 0000000000001011 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -2465,7 +2465,7 @@ Executing machine codes #0009: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000B: Register:::: -#000B: GR0: 55 = #0037 = 0000000000110111 +#000B: GR0: 55 = #0037 = 0000000000110111 = '7' #000B: GR1: 11 = #000B = 0000000000001011 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -2512,7 +2512,7 @@ Executing machine codes #000B: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000F: Register:::: -#000F: GR0: 55 = #0037 = 0000000000110111 +#000F: GR0: 55 = #0037 = 0000000000110111 = '7' #000F: GR1: 11 = #000B = 0000000000001011 #000F: GR2: 0 = #0000 = 0000000000000000 #000F: GR3: 0 = #0000 = 0000000000000000 @@ -2559,7 +2559,7 @@ Executing machine codes #000F: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0010: Register:::: -#0010: GR0: 55 = #0037 = 0000000000110111 +#0010: GR0: 55 = #0037 = 0000000000110111 = '7' #0010: GR1: 0 = #0000 = 0000000000000000 #0010: GR2: 0 = #0000 = 0000000000000000 #0010: GR3: 0 = #0000 = 0000000000000000 diff --git a/test/integration/casl2/xor4/0.txt b/test/integration/casl2/xor4/0.txt index 9d68242..75bf4f7 100644 --- a/test/integration/casl2/xor4/0.txt +++ b/test/integration/casl2/xor4/0.txt @@ -1094,7 +1094,7 @@ Executing machine codes #0007: Register:::: #0007: GR0: 0 = #0000 = 0000000000000000 -#0007: GR1: 81 = #0051 = 0000000001010001 +#0007: GR1: 81 = #0051 = 0000000001010001 = 'Q' #0007: GR2: 3 = #0003 = 0000000000000011 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 diff --git a/test/integration/comet2/TEST.mk b/test/integration/comet2/TEST.mk index ffac1fd..a078b14 100644 --- a/test/integration/comet2/TEST.mk +++ b/test/integration/comet2/TEST.mk @@ -12,7 +12,7 @@ UNITNAME = `pwd | xargs basename` check: clean report.txt prepare: cleanall 0.txt $(OBJFILE) clean: - @rm -f 1.txt diff.txt report.txt $(OBJFILE) + @rm -f 1.txt diff.txt report.txt cleanall: clean @rm -f 0.txt $(OBJFILE) $(OBJFILE): $(CASL2) $(ASFILE) diff --git a/test/integration/comet2/sum_10_T/0.txt b/test/integration/comet2/sum_10_T/0.txt index 40b54c0..3fe865f 100644 --- a/test/integration/comet2/sum_10_T/0.txt +++ b/test/integration/comet2/sum_10_T/0.txt @@ -249,7 +249,7 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 10 = #000A = 0000000000001010 +#0007: GR0: 10 = #000A = 0000000000001010 = '\n' #0007: GR1: 4 = #0004 = 0000000000000100 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -262,7 +262,7 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 10 = #000A = 0000000000001010 +#0009: GR0: 10 = #000A = 0000000000001010 = '\n' #0009: GR1: 5 = #0005 = 0000000000000101 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -275,7 +275,7 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 10 = #000A = 0000000000001010 +#000B: GR0: 10 = #000A = 0000000000001010 = '\n' #000B: GR1: 5 = #0005 = 0000000000000101 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -288,7 +288,7 @@ Executing machine codes #000B: FR (OF SF ZF): 010 #000D: Register:::: -#000D: GR0: 10 = #000A = 0000000000001010 +#000D: GR0: 10 = #000A = 0000000000001010 = '\n' #000D: GR1: 5 = #0005 = 0000000000000101 #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 @@ -301,7 +301,7 @@ Executing machine codes #000D: FR (OF SF ZF): 010 #0006: Register:::: -#0006: GR0: 10 = #000A = 0000000000001010 +#0006: GR0: 10 = #000A = 0000000000001010 = '\n' #0006: GR1: 5 = #0005 = 0000000000000101 #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 @@ -509,7 +509,7 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 36 = #0024 = 0000000000100100 +#0007: GR0: 36 = #0024 = 0000000000100100 = '$' #0007: GR1: 8 = #0008 = 0000000000001000 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -522,8 +522,8 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 36 = #0024 = 0000000000100100 -#0009: GR1: 9 = #0009 = 0000000000001001 +#0009: GR0: 36 = #0024 = 0000000000100100 = '$' +#0009: GR1: 9 = #0009 = 0000000000001001 = '\t' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -535,8 +535,8 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 36 = #0024 = 0000000000100100 -#000B: GR1: 9 = #0009 = 0000000000001001 +#000B: GR0: 36 = #0024 = 0000000000100100 = '$' +#000B: GR1: 9 = #0009 = 0000000000001001 = '\t' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -548,8 +548,8 @@ Executing machine codes #000B: FR (OF SF ZF): 010 #000D: Register:::: -#000D: GR0: 36 = #0024 = 0000000000100100 -#000D: GR1: 9 = #0009 = 0000000000001001 +#000D: GR0: 36 = #0024 = 0000000000100100 = '$' +#000D: GR1: 9 = #0009 = 0000000000001001 = '\t' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -561,8 +561,8 @@ Executing machine codes #000D: FR (OF SF ZF): 010 #0006: Register:::: -#0006: GR0: 36 = #0024 = 0000000000100100 -#0006: GR1: 9 = #0009 = 0000000000001001 +#0006: GR0: 36 = #0024 = 0000000000100100 = '$' +#0006: GR1: 9 = #0009 = 0000000000001001 = '\t' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -574,8 +574,8 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 45 = #002D = 0000000000101101 -#0007: GR1: 9 = #0009 = 0000000000001001 +#0007: GR0: 45 = #002D = 0000000000101101 = '-' +#0007: GR1: 9 = #0009 = 0000000000001001 = '\t' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -587,8 +587,8 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 45 = #002D = 0000000000101101 -#0009: GR1: 10 = #000A = 0000000000001010 +#0009: GR0: 45 = #002D = 0000000000101101 = '-' +#0009: GR1: 10 = #000A = 0000000000001010 = '\n' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -600,8 +600,8 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 45 = #002D = 0000000000101101 -#000B: GR1: 10 = #000A = 0000000000001010 +#000B: GR0: 45 = #002D = 0000000000101101 = '-' +#000B: GR1: 10 = #000A = 0000000000001010 = '\n' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -613,8 +613,8 @@ Executing machine codes #000B: FR (OF SF ZF): 001 #000D: Register:::: -#000D: GR0: 45 = #002D = 0000000000101101 -#000D: GR1: 10 = #000A = 0000000000001010 +#000D: GR0: 45 = #002D = 0000000000101101 = '-' +#000D: GR1: 10 = #000A = 0000000000001010 = '\n' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -626,8 +626,8 @@ Executing machine codes #000D: FR (OF SF ZF): 001 #0006: Register:::: -#0006: GR0: 45 = #002D = 0000000000101101 -#0006: GR1: 10 = #000A = 0000000000001010 +#0006: GR0: 45 = #002D = 0000000000101101 = '-' +#0006: GR1: 10 = #000A = 0000000000001010 = '\n' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -639,8 +639,8 @@ Executing machine codes #0006: FR (OF SF ZF): 001 #0007: Register:::: -#0007: GR0: 55 = #0037 = 0000000000110111 -#0007: GR1: 10 = #000A = 0000000000001010 +#0007: GR0: 55 = #0037 = 0000000000110111 = '7' +#0007: GR1: 10 = #000A = 0000000000001010 = '\n' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -652,7 +652,7 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 55 = #0037 = 0000000000110111 +#0009: GR0: 55 = #0037 = 0000000000110111 = '7' #0009: GR1: 11 = #000B = 0000000000001011 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -665,7 +665,7 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 55 = #0037 = 0000000000110111 +#000B: GR0: 55 = #0037 = 0000000000110111 = '7' #000B: GR1: 11 = #000B = 0000000000001011 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -678,7 +678,7 @@ Executing machine codes #000B: FR (OF SF ZF): 000 #000F: Register:::: -#000F: GR0: 55 = #0037 = 0000000000110111 +#000F: GR0: 55 = #0037 = 0000000000110111 = '7' #000F: GR1: 11 = #000B = 0000000000001011 #000F: GR2: 0 = #0000 = 0000000000000000 #000F: GR3: 0 = #0000 = 0000000000000000 @@ -691,7 +691,7 @@ Executing machine codes #000F: FR (OF SF ZF): 000 #0010: Register:::: -#0010: GR0: 55 = #0037 = 0000000000110111 +#0010: GR0: 55 = #0037 = 0000000000110111 = '7' #0010: GR1: 0 = #0000 = 0000000000000000 #0010: GR2: 0 = #0000 = 0000000000000000 #0010: GR3: 0 = #0000 = 0000000000000000 diff --git a/test/integration/comet2/sum_10_t/0.txt b/test/integration/comet2/sum_10_t/0.txt index 92724ec..ec23100 100644 --- a/test/integration/comet2/sum_10_t/0.txt +++ b/test/integration/comet2/sum_10_t/0.txt @@ -249,7 +249,7 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 10 = #000A = 0000000000001010 +#0007: GR0: 10 = #000A = 0000000000001010 = '\n' #0007: GR1: 4 = #0004 = 0000000000000100 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -262,7 +262,7 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 10 = #000A = 0000000000001010 +#0009: GR0: 10 = #000A = 0000000000001010 = '\n' #0009: GR1: 5 = #0005 = 0000000000000101 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -275,7 +275,7 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 10 = #000A = 0000000000001010 +#000B: GR0: 10 = #000A = 0000000000001010 = '\n' #000B: GR1: 5 = #0005 = 0000000000000101 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -288,7 +288,7 @@ Executing machine codes #000B: FR (OF SF ZF): 010 #000D: Register:::: -#000D: GR0: 10 = #000A = 0000000000001010 +#000D: GR0: 10 = #000A = 0000000000001010 = '\n' #000D: GR1: 5 = #0005 = 0000000000000101 #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 @@ -301,7 +301,7 @@ Executing machine codes #000D: FR (OF SF ZF): 010 #0006: Register:::: -#0006: GR0: 10 = #000A = 0000000000001010 +#0006: GR0: 10 = #000A = 0000000000001010 = '\n' #0006: GR1: 5 = #0005 = 0000000000000101 #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 @@ -509,7 +509,7 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 36 = #0024 = 0000000000100100 +#0007: GR0: 36 = #0024 = 0000000000100100 = '$' #0007: GR1: 8 = #0008 = 0000000000001000 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -522,8 +522,8 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 36 = #0024 = 0000000000100100 -#0009: GR1: 9 = #0009 = 0000000000001001 +#0009: GR0: 36 = #0024 = 0000000000100100 = '$' +#0009: GR1: 9 = #0009 = 0000000000001001 = '\t' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -535,8 +535,8 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 36 = #0024 = 0000000000100100 -#000B: GR1: 9 = #0009 = 0000000000001001 +#000B: GR0: 36 = #0024 = 0000000000100100 = '$' +#000B: GR1: 9 = #0009 = 0000000000001001 = '\t' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -548,8 +548,8 @@ Executing machine codes #000B: FR (OF SF ZF): 010 #000D: Register:::: -#000D: GR0: 36 = #0024 = 0000000000100100 -#000D: GR1: 9 = #0009 = 0000000000001001 +#000D: GR0: 36 = #0024 = 0000000000100100 = '$' +#000D: GR1: 9 = #0009 = 0000000000001001 = '\t' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -561,8 +561,8 @@ Executing machine codes #000D: FR (OF SF ZF): 010 #0006: Register:::: -#0006: GR0: 36 = #0024 = 0000000000100100 -#0006: GR1: 9 = #0009 = 0000000000001001 +#0006: GR0: 36 = #0024 = 0000000000100100 = '$' +#0006: GR1: 9 = #0009 = 0000000000001001 = '\t' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -574,8 +574,8 @@ Executing machine codes #0006: FR (OF SF ZF): 010 #0007: Register:::: -#0007: GR0: 45 = #002D = 0000000000101101 -#0007: GR1: 9 = #0009 = 0000000000001001 +#0007: GR0: 45 = #002D = 0000000000101101 = '-' +#0007: GR1: 9 = #0009 = 0000000000001001 = '\t' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -587,8 +587,8 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 45 = #002D = 0000000000101101 -#0009: GR1: 10 = #000A = 0000000000001010 +#0009: GR0: 45 = #002D = 0000000000101101 = '-' +#0009: GR1: 10 = #000A = 0000000000001010 = '\n' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -600,8 +600,8 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 45 = #002D = 0000000000101101 -#000B: GR1: 10 = #000A = 0000000000001010 +#000B: GR0: 45 = #002D = 0000000000101101 = '-' +#000B: GR1: 10 = #000A = 0000000000001010 = '\n' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -613,8 +613,8 @@ Executing machine codes #000B: FR (OF SF ZF): 001 #000D: Register:::: -#000D: GR0: 45 = #002D = 0000000000101101 -#000D: GR1: 10 = #000A = 0000000000001010 +#000D: GR0: 45 = #002D = 0000000000101101 = '-' +#000D: GR1: 10 = #000A = 0000000000001010 = '\n' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -626,8 +626,8 @@ Executing machine codes #000D: FR (OF SF ZF): 001 #0006: Register:::: -#0006: GR0: 45 = #002D = 0000000000101101 -#0006: GR1: 10 = #000A = 0000000000001010 +#0006: GR0: 45 = #002D = 0000000000101101 = '-' +#0006: GR1: 10 = #000A = 0000000000001010 = '\n' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -639,8 +639,8 @@ Executing machine codes #0006: FR (OF SF ZF): 001 #0007: Register:::: -#0007: GR0: 55 = #0037 = 0000000000110111 -#0007: GR1: 10 = #000A = 0000000000001010 +#0007: GR0: 55 = #0037 = 0000000000110111 = '7' +#0007: GR1: 10 = #000A = 0000000000001010 = '\n' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -652,7 +652,7 @@ Executing machine codes #0007: FR (OF SF ZF): 000 #0009: Register:::: -#0009: GR0: 55 = #0037 = 0000000000110111 +#0009: GR0: 55 = #0037 = 0000000000110111 = '7' #0009: GR1: 11 = #000B = 0000000000001011 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -665,7 +665,7 @@ Executing machine codes #0009: FR (OF SF ZF): 000 #000B: Register:::: -#000B: GR0: 55 = #0037 = 0000000000110111 +#000B: GR0: 55 = #0037 = 0000000000110111 = '7' #000B: GR1: 11 = #000B = 0000000000001011 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -678,7 +678,7 @@ Executing machine codes #000B: FR (OF SF ZF): 000 #000F: Register:::: -#000F: GR0: 55 = #0037 = 0000000000110111 +#000F: GR0: 55 = #0037 = 0000000000110111 = '7' #000F: GR1: 11 = #000B = 0000000000001011 #000F: GR2: 0 = #0000 = 0000000000000000 #000F: GR3: 0 = #0000 = 0000000000000000 @@ -691,7 +691,7 @@ Executing machine codes #000F: FR (OF SF ZF): 000 #0010: Register:::: -#0010: GR0: 55 = #0037 = 0000000000110111 +#0010: GR0: 55 = #0037 = 0000000000110111 = '7' #0010: GR1: 0 = #0000 = 0000000000000000 #0010: GR2: 0 = #0000 = 0000000000000000 #0010: GR3: 0 = #0000 = 0000000000000000 diff --git a/test/integration/comet2/sum_10_td/0.txt b/test/integration/comet2/sum_10_td/0.txt index c31c933..7b57453 100644 --- a/test/integration/comet2/sum_10_td/0.txt +++ b/test/integration/comet2/sum_10_td/0.txt @@ -895,7 +895,7 @@ Executing machine codes #0006: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0007: Register:::: -#0007: GR0: 10 = #000A = 0000000000001010 +#0007: GR0: 10 = #000A = 0000000000001010 = '\n' #0007: GR1: 4 = #0004 = 0000000000000100 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -942,7 +942,7 @@ Executing machine codes #0007: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0009: Register:::: -#0009: GR0: 10 = #000A = 0000000000001010 +#0009: GR0: 10 = #000A = 0000000000001010 = '\n' #0009: GR1: 5 = #0005 = 0000000000000101 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -989,7 +989,7 @@ Executing machine codes #0009: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000B: Register:::: -#000B: GR0: 10 = #000A = 0000000000001010 +#000B: GR0: 10 = #000A = 0000000000001010 = '\n' #000B: GR1: 5 = #0005 = 0000000000000101 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -1036,7 +1036,7 @@ Executing machine codes #000B: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000D: Register:::: -#000D: GR0: 10 = #000A = 0000000000001010 +#000D: GR0: 10 = #000A = 0000000000001010 = '\n' #000D: GR1: 5 = #0005 = 0000000000000101 #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 @@ -1083,7 +1083,7 @@ Executing machine codes #000D: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0006: Register:::: -#0006: GR0: 10 = #000A = 0000000000001010 +#0006: GR0: 10 = #000A = 0000000000001010 = '\n' #0006: GR1: 5 = #0005 = 0000000000000101 #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 @@ -1835,7 +1835,7 @@ Executing machine codes #0006: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0007: Register:::: -#0007: GR0: 36 = #0024 = 0000000000100100 +#0007: GR0: 36 = #0024 = 0000000000100100 = '$' #0007: GR1: 8 = #0008 = 0000000000001000 #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 @@ -1882,8 +1882,8 @@ Executing machine codes #0007: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0009: Register:::: -#0009: GR0: 36 = #0024 = 0000000000100100 -#0009: GR1: 9 = #0009 = 0000000000001001 +#0009: GR0: 36 = #0024 = 0000000000100100 = '$' +#0009: GR1: 9 = #0009 = 0000000000001001 = '\t' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -1929,8 +1929,8 @@ Executing machine codes #0009: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000B: Register:::: -#000B: GR0: 36 = #0024 = 0000000000100100 -#000B: GR1: 9 = #0009 = 0000000000001001 +#000B: GR0: 36 = #0024 = 0000000000100100 = '$' +#000B: GR1: 9 = #0009 = 0000000000001001 = '\t' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -1976,8 +1976,8 @@ Executing machine codes #000B: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000D: Register:::: -#000D: GR0: 36 = #0024 = 0000000000100100 -#000D: GR1: 9 = #0009 = 0000000000001001 +#000D: GR0: 36 = #0024 = 0000000000100100 = '$' +#000D: GR1: 9 = #0009 = 0000000000001001 = '\t' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -2023,8 +2023,8 @@ Executing machine codes #000D: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0006: Register:::: -#0006: GR0: 36 = #0024 = 0000000000100100 -#0006: GR1: 9 = #0009 = 0000000000001001 +#0006: GR0: 36 = #0024 = 0000000000100100 = '$' +#0006: GR1: 9 = #0009 = 0000000000001001 = '\t' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -2070,8 +2070,8 @@ Executing machine codes #0006: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0007: Register:::: -#0007: GR0: 45 = #002D = 0000000000101101 -#0007: GR1: 9 = #0009 = 0000000000001001 +#0007: GR0: 45 = #002D = 0000000000101101 = '-' +#0007: GR1: 9 = #0009 = 0000000000001001 = '\t' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -2117,8 +2117,8 @@ Executing machine codes #0007: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0009: Register:::: -#0009: GR0: 45 = #002D = 0000000000101101 -#0009: GR1: 10 = #000A = 0000000000001010 +#0009: GR0: 45 = #002D = 0000000000101101 = '-' +#0009: GR1: 10 = #000A = 0000000000001010 = '\n' #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 #0009: GR4: 0 = #0000 = 0000000000000000 @@ -2164,8 +2164,8 @@ Executing machine codes #0009: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000B: Register:::: -#000B: GR0: 45 = #002D = 0000000000101101 -#000B: GR1: 10 = #000A = 0000000000001010 +#000B: GR0: 45 = #002D = 0000000000101101 = '-' +#000B: GR1: 10 = #000A = 0000000000001010 = '\n' #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 #000B: GR4: 0 = #0000 = 0000000000000000 @@ -2211,8 +2211,8 @@ Executing machine codes #000B: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000D: Register:::: -#000D: GR0: 45 = #002D = 0000000000101101 -#000D: GR1: 10 = #000A = 0000000000001010 +#000D: GR0: 45 = #002D = 0000000000101101 = '-' +#000D: GR1: 10 = #000A = 0000000000001010 = '\n' #000D: GR2: 0 = #0000 = 0000000000000000 #000D: GR3: 0 = #0000 = 0000000000000000 #000D: GR4: 0 = #0000 = 0000000000000000 @@ -2258,8 +2258,8 @@ Executing machine codes #000D: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0006: Register:::: -#0006: GR0: 45 = #002D = 0000000000101101 -#0006: GR1: 10 = #000A = 0000000000001010 +#0006: GR0: 45 = #002D = 0000000000101101 = '-' +#0006: GR1: 10 = #000A = 0000000000001010 = '\n' #0006: GR2: 0 = #0000 = 0000000000000000 #0006: GR3: 0 = #0000 = 0000000000000000 #0006: GR4: 0 = #0000 = 0000000000000000 @@ -2305,8 +2305,8 @@ Executing machine codes #0006: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0007: Register:::: -#0007: GR0: 55 = #0037 = 0000000000110111 -#0007: GR1: 10 = #000A = 0000000000001010 +#0007: GR0: 55 = #0037 = 0000000000110111 = '7' +#0007: GR1: 10 = #000A = 0000000000001010 = '\n' #0007: GR2: 0 = #0000 = 0000000000000000 #0007: GR3: 0 = #0000 = 0000000000000000 #0007: GR4: 0 = #0000 = 0000000000000000 @@ -2352,7 +2352,7 @@ Executing machine codes #0007: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0009: Register:::: -#0009: GR0: 55 = #0037 = 0000000000110111 +#0009: GR0: 55 = #0037 = 0000000000110111 = '7' #0009: GR1: 11 = #000B = 0000000000001011 #0009: GR2: 0 = #0000 = 0000000000000000 #0009: GR3: 0 = #0000 = 0000000000000000 @@ -2399,7 +2399,7 @@ Executing machine codes #0009: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000B: Register:::: -#000B: GR0: 55 = #0037 = 0000000000110111 +#000B: GR0: 55 = #0037 = 0000000000110111 = '7' #000B: GR1: 11 = #000B = 0000000000001011 #000B: GR2: 0 = #0000 = 0000000000000000 #000B: GR3: 0 = #0000 = 0000000000000000 @@ -2446,7 +2446,7 @@ Executing machine codes #000B: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #000F: Register:::: -#000F: GR0: 55 = #0037 = 0000000000110111 +#000F: GR0: 55 = #0037 = 0000000000110111 = '7' #000F: GR1: 11 = #000B = 0000000000001011 #000F: GR2: 0 = #0000 = 0000000000000000 #000F: GR3: 0 = #0000 = 0000000000000000 @@ -2493,7 +2493,7 @@ Executing machine codes #000F: 01F0: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 #0010: Register:::: -#0010: GR0: 55 = #0037 = 0000000000110111 +#0010: GR0: 55 = #0037 = 0000000000110111 = '7' #0010: GR1: 0 = #0000 = 0000000000000000 #0010: GR2: 0 = #0000 = 0000000000000000 #0010: GR3: 0 = #0000 = 0000000000000000 diff --git a/test/integration/dumpword/TEST.mk b/test/integration/dumpword/TEST.mk index a31c2c4..bbd425b 100644 --- a/test/integration/dumpword/TEST.mk +++ b/test/integration/dumpword/TEST.mk @@ -12,13 +12,13 @@ TESTSH = test.sh check: clean report.txt prepare: cleanall 0.txt clean: - @rm -f 1.txt diff.txt report.txt + @rm -f 1.txt diff.txt report.txt err.txt cleanall: clean - @rm -f 0.txt + @rm -f 0.txt test.sh 0.txt 1.txt: $(DUMPWORD) $(TESTSH) @sh $(TESTSH) >>$@ 2>$(ERRFILE); \ if test -s $(ERRFILE); then cat err.txt >>$@; else rm -f $(ERRFILE); fi -$(TESTSH): ../ARGS.txt +$(TESTSH): $(ARGFILE) @xargs -n1 echo "$(DUMPWORD) $(DUMPWORDFLAG) " <$^ >$@ diff.txt: 1.txt @-diff -c 0.txt 1.txt >$@ 2>&1 diff --git a/test/integration/dumpword/a/0.txt b/test/integration/dumpword/a/0.txt index 1f4da4d..6e3cb47 100644 --- a/test/integration/dumpword/a/0.txt +++ b/test/integration/dumpword/a/0.txt @@ -1,6 +1,6 @@ 0: 0 = #0000 = 0000000000000000 1: 1 = #0001 = 0000000000000001 - 10: 10 = #000A = 0000000000001010 + 10: 10 = #000A = 0000000000001010 = '\n' 32767: 32767 = #7FFF = 0111111111111111 32768: -32768 = #8000 = 1000000000000000 65535: -1 = #FFFF = 1111111111111111 diff --git a/test/integration/dumpword/a/Makefile b/test/integration/dumpword/a/Makefile index 20434c2..d86e756 100644 --- a/test/integration/dumpword/a/Makefile +++ b/test/integration/dumpword/a/Makefile @@ -1,3 +1,4 @@ include ../CMD.mk DUMPWORDFLAG = -a +ARGFILE = ../ARGS.txt include ../TEST.mk diff --git a/test/integration/dumpword/chars/0.txt b/test/integration/dumpword/chars/0.txt new file mode 100644 index 0000000..da53842 --- /dev/null +++ b/test/integration/dumpword/chars/0.txt @@ -0,0 +1,128 @@ + 0: 0 = #0000 = 0000000000000000 + 1: 1 = #0001 = 0000000000000001 + 2: 2 = #0002 = 0000000000000010 + 3: 3 = #0003 = 0000000000000011 + 4: 4 = #0004 = 0000000000000100 + 5: 5 = #0005 = 0000000000000101 + 6: 6 = #0006 = 0000000000000110 + 7: 7 = #0007 = 0000000000000111 + 8: 8 = #0008 = 0000000000001000 + 9: 9 = #0009 = 0000000000001001 = '\t' + 10: 10 = #000A = 0000000000001010 = '\n' + 11: 11 = #000B = 0000000000001011 + 12: 12 = #000C = 0000000000001100 + 13: 13 = #000D = 0000000000001101 + 14: 14 = #000E = 0000000000001110 + 15: 15 = #000F = 0000000000001111 + 16: 16 = #0010 = 0000000000010000 + 17: 17 = #0011 = 0000000000010001 + 18: 18 = #0012 = 0000000000010010 + 19: 19 = #0013 = 0000000000010011 + 20: 20 = #0014 = 0000000000010100 + 21: 21 = #0015 = 0000000000010101 + 22: 22 = #0016 = 0000000000010110 + 23: 23 = #0017 = 0000000000010111 + 24: 24 = #0018 = 0000000000011000 + 25: 25 = #0019 = 0000000000011001 + 26: 26 = #001A = 0000000000011010 + 27: 27 = #001B = 0000000000011011 + 28: 28 = #001C = 0000000000011100 + 29: 29 = #001D = 0000000000011101 + 30: 30 = #001E = 0000000000011110 + 31: 31 = #001F = 0000000000011111 + 32: 32 = #0020 = 0000000000100000 = ' ' + 33: 33 = #0021 = 0000000000100001 = '!' + 34: 34 = #0022 = 0000000000100010 = '"' + 35: 35 = #0023 = 0000000000100011 = '#' + 36: 36 = #0024 = 0000000000100100 = '$' + 37: 37 = #0025 = 0000000000100101 = '%' + 38: 38 = #0026 = 0000000000100110 = '&' + 39: 39 = #0027 = 0000000000100111 = ''' + 40: 40 = #0028 = 0000000000101000 = '(' + 41: 41 = #0029 = 0000000000101001 = ')' + 42: 42 = #002A = 0000000000101010 = '*' + 43: 43 = #002B = 0000000000101011 = '+' + 44: 44 = #002C = 0000000000101100 = ',' + 45: 45 = #002D = 0000000000101101 = '-' + 46: 46 = #002E = 0000000000101110 = '.' + 47: 47 = #002F = 0000000000101111 = '/' + 48: 48 = #0030 = 0000000000110000 = '0' + 49: 49 = #0031 = 0000000000110001 = '1' + 50: 50 = #0032 = 0000000000110010 = '2' + 51: 51 = #0033 = 0000000000110011 = '3' + 52: 52 = #0034 = 0000000000110100 = '4' + 53: 53 = #0035 = 0000000000110101 = '5' + 54: 54 = #0036 = 0000000000110110 = '6' + 55: 55 = #0037 = 0000000000110111 = '7' + 56: 56 = #0038 = 0000000000111000 = '8' + 57: 57 = #0039 = 0000000000111001 = '9' + 58: 58 = #003A = 0000000000111010 = ':' + 59: 59 = #003B = 0000000000111011 = ';' + 60: 60 = #003C = 0000000000111100 = '<' + 61: 61 = #003D = 0000000000111101 = '=' + 62: 62 = #003E = 0000000000111110 = '>' + 63: 63 = #003F = 0000000000111111 = '?' + 64: 64 = #0040 = 0000000001000000 = '@' + 65: 65 = #0041 = 0000000001000001 = 'A' + 66: 66 = #0042 = 0000000001000010 = 'B' + 67: 67 = #0043 = 0000000001000011 = 'C' + 68: 68 = #0044 = 0000000001000100 = 'D' + 69: 69 = #0045 = 0000000001000101 = 'E' + 70: 70 = #0046 = 0000000001000110 = 'F' + 71: 71 = #0047 = 0000000001000111 = 'G' + 72: 72 = #0048 = 0000000001001000 = 'H' + 73: 73 = #0049 = 0000000001001001 = 'I' + 74: 74 = #004A = 0000000001001010 = 'J' + 75: 75 = #004B = 0000000001001011 = 'K' + 76: 76 = #004C = 0000000001001100 = 'L' + 77: 77 = #004D = 0000000001001101 = 'M' + 78: 78 = #004E = 0000000001001110 = 'N' + 79: 79 = #004F = 0000000001001111 = 'O' + 80: 80 = #0050 = 0000000001010000 = 'P' + 81: 81 = #0051 = 0000000001010001 = 'Q' + 82: 82 = #0052 = 0000000001010010 = 'R' + 83: 83 = #0053 = 0000000001010011 = 'S' + 84: 84 = #0054 = 0000000001010100 = 'T' + 85: 85 = #0055 = 0000000001010101 = 'U' + 86: 86 = #0056 = 0000000001010110 = 'V' + 87: 87 = #0057 = 0000000001010111 = 'W' + 88: 88 = #0058 = 0000000001011000 = 'X' + 89: 89 = #0059 = 0000000001011001 = 'Y' + 90: 90 = #005A = 0000000001011010 = 'Z' + 91: 91 = #005B = 0000000001011011 = '[' + 92: 92 = #005C = 0000000001011100 = '\' + 93: 93 = #005D = 0000000001011101 = ']' + 94: 94 = #005E = 0000000001011110 = '^' + 95: 95 = #005F = 0000000001011111 = '_' + 96: 96 = #0060 = 0000000001100000 = '`' + 97: 97 = #0061 = 0000000001100001 = 'a' + 98: 98 = #0062 = 0000000001100010 = 'b' + 99: 99 = #0063 = 0000000001100011 = 'c' + 100: 100 = #0064 = 0000000001100100 = 'd' + 101: 101 = #0065 = 0000000001100101 = 'e' + 102: 102 = #0066 = 0000000001100110 = 'f' + 103: 103 = #0067 = 0000000001100111 = 'g' + 104: 104 = #0068 = 0000000001101000 = 'h' + 105: 105 = #0069 = 0000000001101001 = 'i' + 106: 106 = #006A = 0000000001101010 = 'j' + 107: 107 = #006B = 0000000001101011 = 'k' + 108: 108 = #006C = 0000000001101100 = 'l' + 109: 109 = #006D = 0000000001101101 = 'm' + 110: 110 = #006E = 0000000001101110 = 'n' + 111: 111 = #006F = 0000000001101111 = 'o' + 112: 112 = #0070 = 0000000001110000 = 'p' + 113: 113 = #0071 = 0000000001110001 = 'q' + 114: 114 = #0072 = 0000000001110010 = 'r' + 115: 115 = #0073 = 0000000001110011 = 's' + 116: 116 = #0074 = 0000000001110100 = 't' + 117: 117 = #0075 = 0000000001110101 = 'u' + 118: 118 = #0076 = 0000000001110110 = 'v' + 119: 119 = #0077 = 0000000001110111 = 'w' + 120: 120 = #0078 = 0000000001111000 = 'x' + 121: 121 = #0079 = 0000000001111001 = 'y' + 122: 122 = #007A = 0000000001111010 = 'z' + 123: 123 = #007B = 0000000001111011 = '{' + 124: 124 = #007C = 0000000001111100 = '|' + 125: 125 = #007D = 0000000001111101 = '}' + 126: 126 = #007E = 0000000001111110 = '~' + 127: 127 = #007F = 0000000001111111 diff --git a/test/integration/dumpword/chars/CHARTBL_NUM.txt b/test/integration/dumpword/chars/CHARTBL_NUM.txt new file mode 100644 index 0000000..8ce2c58 --- /dev/null +++ b/test/integration/dumpword/chars/CHARTBL_NUM.txt @@ -0,0 +1,128 @@ +0 +1 +2 +3 +4 +5 +6 +7 +8 +9 +10 +11 +12 +13 +14 +15 +16 +17 +18 +19 +20 +21 +22 +23 +24 +25 +26 +27 +28 +29 +30 +31 +32 +33 +34 +35 +36 +37 +38 +39 +40 +41 +42 +43 +44 +45 +46 +47 +48 +49 +50 +51 +52 +53 +54 +55 +56 +57 +58 +59 +60 +61 +62 +63 +64 +65 +66 +67 +68 +69 +70 +71 +72 +73 +74 +75 +76 +77 +78 +79 +80 +81 +82 +83 +84 +85 +86 +87 +88 +89 +90 +91 +92 +93 +94 +95 +96 +97 +98 +99 +100 +101 +102 +103 +104 +105 +106 +107 +108 +109 +110 +111 +112 +113 +114 +115 +116 +117 +118 +119 +120 +121 +122 +123 +124 +125 +126 +127 diff --git a/test/integration/dumpword/chars/Makefile b/test/integration/dumpword/chars/Makefile new file mode 100644 index 0000000..3e7e918 --- /dev/null +++ b/test/integration/dumpword/chars/Makefile @@ -0,0 +1,3 @@ +include ../CMD.mk +ARGFILE = CHARTBL_NUM.txt +include ../TEST.mk diff --git a/test/integration/dumpword/l/0.txt b/test/integration/dumpword/l/0.txt index 629f201..0522b5d 100644 --- a/test/integration/dumpword/l/0.txt +++ b/test/integration/dumpword/l/0.txt @@ -1,6 +1,6 @@ 0: 0 = #0000 = 0000000000000000 1: 1 = #0001 = 0000000000000001 - 10: 10 = #000A = 0000000000001010 + 10: 10 = #000A = 0000000000001010 = '\n' 32767: 32767 = #7FFF = 0111111111111111 32768: 32768 = #8000 = 1000000000000000 65535: 65535 = #FFFF = 1111111111111111 diff --git a/test/integration/dumpword/l/Makefile b/test/integration/dumpword/l/Makefile index f91fce4..14cc193 100644 --- a/test/integration/dumpword/l/Makefile +++ b/test/integration/dumpword/l/Makefile @@ -1,3 +1,4 @@ include ../CMD.mk DUMPWORDFLAG = -l +ARGFILE = ../ARGS.txt include ../TEST.mk diff --git a/test/integration/dumpword/noopt/0.txt b/test/integration/dumpword/noopt/0.txt index 1f4da4d..6e3cb47 100644 --- a/test/integration/dumpword/noopt/0.txt +++ b/test/integration/dumpword/noopt/0.txt @@ -1,6 +1,6 @@ 0: 0 = #0000 = 0000000000000000 1: 1 = #0001 = 0000000000000001 - 10: 10 = #000A = 0000000000001010 + 10: 10 = #000A = 0000000000001010 = '\n' 32767: 32767 = #7FFF = 0111111111111111 32768: -32768 = #8000 = 1000000000000000 65535: -1 = #FFFF = 1111111111111111 diff --git a/test/integration/dumpword/noopt/Makefile b/test/integration/dumpword/noopt/Makefile index 8d34433..176435d 100644 --- a/test/integration/dumpword/noopt/Makefile +++ b/test/integration/dumpword/noopt/Makefile @@ -1,2 +1,3 @@ include ../CMD.mk +ARGFILE = ../ARGS.txt include ../TEST.mk