From ebf539608eb13e480243d7ef9ce1585a4a3f7469 Mon Sep 17 00:00:00 2001 From: j8takagi Date: Tue, 30 Jun 2026 16:21:50 +0900 Subject: [PATCH] =?utf8?q?comet2monitor=E3=81=A7=E9=80=A3=E7=B6=9A?= =?utf8?q?=E3=81=99=E3=82=8B0=E3=81=AFDS=E3=81=A8=E3=81=97=E3=81=A6?= =?utf8?q?=E5=87=BA=E5=8A=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit バージョンを0.6に comet2monitorの出力メッセージの修正 テストの修正 マニュアルの修正 make versionをスタンプ方式に --- Makefile | 6 +- VERSION | 2 +- as/cmd/IN/in_len10.casl | 7 + as/err/err_208.casl | 2 +- as/sample/ldlad.casl | 15 +- as/sample/ldlad0.casl | 10 + as/sample/ldlad2.casl | 13 ++ doc/manual.texi | 74 ++++--- include/disassemble.h | 9 +- src/casl2rev.c | 6 +- src/disassemble.c | 118 ++++------ src/dump.c | 7 +- src/exec.c | 9 +- src/monitor.c | 4 +- test/system/casl2_cmd/cmd_adda_r1_r2/0.txt | 2 - test/system/casl2_cmd/cmd_adda_r_adr/0.txt | 2 - .../system/casl2_cmd/cmd_adda_r_adr___o/0.txt | 2 - .../system/casl2_cmd/cmd_adda_r_adr___z/0.txt | 2 - .../system/casl2_cmd/cmd_adda_r_adr__ao/0.txt | 2 - .../casl2_cmd/cmd_adda_r_adr__as0/0.txt | 2 - .../casl2_cmd/cmd_adda_r_adr__as1/0.txt | 2 - .../system/casl2_cmd/cmd_adda_r_adr__az/0.txt | 2 - .../system/casl2_cmd/cmd_adda_r_adr__lo/0.txt | 2 - test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt | 2 - test/system/casl2_cmd/cmd_addl_r1_r2/0.txt | 2 - test/system/casl2_cmd/cmd_addl_r_adr/0.txt | 2 - .../system/casl2_cmd/cmd_addl_r_adr__ao/0.txt | 2 - .../casl2_cmd/cmd_addl_r_adr__as0/0.txt | 2 - .../casl2_cmd/cmd_addl_r_adr__as1/0.txt | 2 - .../system/casl2_cmd/cmd_addl_r_adr__az/0.txt | 2 - .../system/casl2_cmd/cmd_addl_r_adr__lo/0.txt | 2 - test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt | 2 - test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt | 2 - test/system/casl2_cmd/cmd_and_r1_r2/0.txt | 2 - test/system/casl2_cmd/cmd_and_r_adr/0.txt | 2 - test/system/casl2_cmd/cmd_and_r_adr__s/0.txt | 2 - test/system/casl2_cmd/cmd_and_r_adr__z/0.txt | 2 - test/system/casl2_cmd/cmd_and_r_adr_x/0.txt | 2 - test/system/casl2_cmd/cmd_call__both/0.txt | 2 - test/system/casl2_cmd/cmd_call__inner/0.txt | 2 - test/system/casl2_cmd/cmd_call__outer/0.txt | 2 - test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt | 2 - test/system/casl2_cmd/cmd_cpa_r_adr/0.txt | 2 - test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt | 2 - test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt | 2 - test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt | 2 - .../system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt | 2 - test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt | 2 - test/system/casl2_cmd/cmd_cpl_r_adr/0.txt | 2 - test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt | 2 - test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt | 2 - test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt | 2 - .../system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt | 2 - test/system/casl2_cmd/cmd_dc__c0/0.txt | 2 - test/system/casl2_cmd/cmd_dc__c1/0.txt | 2 - test/system/casl2_cmd/cmd_dc__c2/0.txt | 2 - test/system/casl2_cmd/cmd_dc__i0/0.txt | 2 - test/system/casl2_cmd/cmd_dc__i1/0.txt | 2 - test/system/casl2_cmd/cmd_dc__io/0.txt | 2 - .../system/casl2_cmd/cmd_dc_label__both/0.txt | 2 - .../casl2_cmd/cmd_dc_label__inner/0.txt | 2 - .../casl2_cmd/cmd_dc_label__outer/0.txt | 2 - test/system/casl2_cmd/cmd_ds/0.txt | 2 - test/system/casl2_cmd/cmd_ds__0/0.txt | 2 - test/system/casl2_cmd/cmd_in/0.txt | 2 - test/system/casl2_cmd/cmd_in_eof/0.txt | 2 - test/system/casl2_cmd/cmd_in_len10/0.txt | 52 +++++ test/system/casl2_cmd/cmd_in_len10/Makefile | 2 + test/system/casl2_cmd/cmd_in_len10/cmd | 1 + .../system/casl2_cmd/cmd_in_len10/teststr.txt | 1 + test/system/casl2_cmd/cmd_in_overflow/0.txt | 205 ++++++++++++++++++ .../system/casl2_cmd/cmd_in_overflow/Makefile | 2 + test/system/casl2_cmd/cmd_in_overflow/cmd | 1 + .../casl2_cmd/cmd_in_overflow/teststr.txt | 1 + test/system/casl2_cmd/cmd_jmi__m/0.txt | 2 - test/system/casl2_cmd/cmd_jmi__o/0.txt | 2 - test/system/casl2_cmd/cmd_jmi__p/0.txt | 2 - test/system/casl2_cmd/cmd_jmi__z/0.txt | 2 - test/system/casl2_cmd/cmd_jnz__m/0.txt | 2 - test/system/casl2_cmd/cmd_jnz__o/0.txt | 2 - test/system/casl2_cmd/cmd_jnz__p/0.txt | 2 - test/system/casl2_cmd/cmd_jnz__z/0.txt | 2 - test/system/casl2_cmd/cmd_jov__m/0.txt | 2 - test/system/casl2_cmd/cmd_jov__o/0.txt | 2 - test/system/casl2_cmd/cmd_jov__p/0.txt | 2 - test/system/casl2_cmd/cmd_jov__z/0.txt | 2 - test/system/casl2_cmd/cmd_jpl__m/0.txt | 2 - test/system/casl2_cmd/cmd_jpl__o/0.txt | 2 - test/system/casl2_cmd/cmd_jpl__p/0.txt | 2 - test/system/casl2_cmd/cmd_jpl__z/0.txt | 2 - test/system/casl2_cmd/cmd_jump__m/0.txt | 2 - test/system/casl2_cmd/cmd_jump__o/0.txt | 2 - test/system/casl2_cmd/cmd_jump__p/0.txt | 2 - test/system/casl2_cmd/cmd_jump__z/0.txt | 2 - test/system/casl2_cmd/cmd_jze__m/0.txt | 2 - test/system/casl2_cmd/cmd_jze__o/0.txt | 2 - test/system/casl2_cmd/cmd_jze__p/0.txt | 2 - test/system/casl2_cmd/cmd_jze__z/0.txt | 2 - test/system/casl2_cmd/cmd_lad_r_adr/0.txt | 2 - test/system/casl2_cmd/cmd_lad_r_adr_x/0.txt | 2 - .../system/casl2_cmd/cmd_lad_r_adr_x__o/0.txt | 2 - .../system/casl2_cmd/cmd_lad_r_adr_x__s/0.txt | 2 - test/system/casl2_cmd/cmd_ld_r1_r2/0.txt | 2 - test/system/casl2_cmd/cmd_ld_r_adr/0.txt | 2 - test/system/casl2_cmd/cmd_ld_r_adr__l/0.txt | 2 - test/system/casl2_cmd/cmd_ld_r_adr_x/0.txt | 2 - test/system/casl2_cmd/cmd_nop/0.txt | 2 - test/system/casl2_cmd/cmd_or_r1_r2/0.txt | 2 - test/system/casl2_cmd/cmd_or_r_adr/0.txt | 2 - test/system/casl2_cmd/cmd_or_r_adr__s/0.txt | 2 - test/system/casl2_cmd/cmd_or_r_adr__z/0.txt | 2 - test/system/casl2_cmd/cmd_or_r_adr_x/0.txt | 2 - test/system/casl2_cmd/cmd_out/0.txt | 2 - test/system/casl2_cmd/cmd_push_pop__0/0.txt | 2 - test/system/casl2_cmd/cmd_push_pop__1/0.txt | 2 - test/system/casl2_cmd/cmd_rpop/0.txt | 2 - test/system/casl2_cmd/cmd_rpush/0.txt | 2 - test/system/casl2_cmd/cmd_sla/0.txt | 2 - test/system/casl2_cmd/cmd_sla__o/0.txt | 2 - test/system/casl2_cmd/cmd_sla__os/0.txt | 2 - test/system/casl2_cmd/cmd_sla__oz/0.txt | 2 - test/system/casl2_cmd/cmd_sla__s/0.txt | 2 - test/system/casl2_cmd/cmd_sla__z/0.txt | 2 - test/system/casl2_cmd/cmd_sll/0.txt | 2 - test/system/casl2_cmd/cmd_sll__o/0.txt | 2 - test/system/casl2_cmd/cmd_sll__os/0.txt | 2 - test/system/casl2_cmd/cmd_sll__oz/0.txt | 2 - test/system/casl2_cmd/cmd_sll__s/0.txt | 2 - test/system/casl2_cmd/cmd_sll__z/0.txt | 2 - test/system/casl2_cmd/cmd_sra/0.txt | 2 - test/system/casl2_cmd/cmd_sra__o/0.txt | 2 - test/system/casl2_cmd/cmd_sra__os/0.txt | 2 - test/system/casl2_cmd/cmd_sra__oz/0.txt | 2 - test/system/casl2_cmd/cmd_sra__s/0.txt | 2 - test/system/casl2_cmd/cmd_sra__z/0.txt | 2 - test/system/casl2_cmd/cmd_srl/0.txt | 2 - test/system/casl2_cmd/cmd_srl__o/0.txt | 2 - test/system/casl2_cmd/cmd_srl__oz/0.txt | 2 - test/system/casl2_cmd/cmd_srl__s/0.txt | 2 - test/system/casl2_cmd/cmd_srl__z/0.txt | 2 - test/system/casl2_cmd/cmd_st_r_adr/0.txt | 2 - test/system/casl2_cmd/cmd_st_r_adr_x/0.txt | 2 - test/system/casl2_cmd/cmd_start_opd/0.txt | 2 - test/system/casl2_cmd/cmd_suba_r1_r2/0.txt | 2 - test/system/casl2_cmd/cmd_suba_r_adr/0.txt | 2 - .../system/casl2_cmd/cmd_suba_r_adr__ao/0.txt | 2 - .../casl2_cmd/cmd_suba_r_adr__as0/0.txt | 2 - .../casl2_cmd/cmd_suba_r_adr__as1/0.txt | 2 - .../system/casl2_cmd/cmd_suba_r_adr__lo/0.txt | 2 - test/system/casl2_cmd/cmd_suba_r_adr__o/0.txt | 2 - test/system/casl2_cmd/cmd_suba_r_adr__z/0.txt | 2 - test/system/casl2_cmd/cmd_suba_r_adr_x/0.txt | 2 - test/system/casl2_cmd/cmd_subl_r1_r2/0.txt | 2 - test/system/casl2_cmd/cmd_subl_r_adr/0.txt | 2 - .../system/casl2_cmd/cmd_subl_r_adr__ao/0.txt | 2 - .../casl2_cmd/cmd_subl_r_adr__as0/0.txt | 2 - .../casl2_cmd/cmd_subl_r_adr__as1/0.txt | 2 - .../system/casl2_cmd/cmd_subl_r_adr__lo/0.txt | 2 - test/system/casl2_cmd/cmd_subl_r_adr__o/0.txt | 2 - test/system/casl2_cmd/cmd_subl_r_adr__z/0.txt | 2 - test/system/casl2_cmd/cmd_subl_r_adr_x/0.txt | 2 - test/system/casl2_cmd/cmd_svc__1/0.txt | 2 - test/system/casl2_cmd/cmd_svc__2/0.txt | 2 - test/system/casl2_cmd/cmd_xor_r1_r2/0.txt | 2 - .../casl2_cmd/cmd_xor_r1_r2__clear/0.txt | 2 - test/system/casl2_cmd/cmd_xor_r_adr/0.txt | 2 - test/system/casl2_cmd/cmd_xor_r_adr__s/0.txt | 2 - test/system/casl2_cmd/cmd_xor_r_adr__z/0.txt | 2 - test/system/casl2_cmd/cmd_xor_r_adr_x/0.txt | 2 - test/system/casl2_err/err_208/teststr.txt | 3 +- test/system/casl2_err/err_209/0.txt | 2 +- test/system/casl2_opt/opt_slao_T/0.txt | 2 - test/system/casl2_opt/opt_slaot/0.txt | 2 - test/system/casl2_opt/opt_slaotd/0.txt | 2 - test/system/casl2_smoke/sum_10/0.txt | 2 - test/system/comet2_cmd/cmd_adda_r1_r2/0.txt | 2 - test/system/comet2_cmd/cmd_adda_r_adr/0.txt | 2 - .../comet2_cmd/cmd_adda_r_adr__ao/0.txt | 2 - .../comet2_cmd/cmd_adda_r_adr__as0/0.txt | 2 - .../comet2_cmd/cmd_adda_r_adr__as1/0.txt | 2 - .../comet2_cmd/cmd_adda_r_adr__az/0.txt | 2 - .../comet2_cmd/cmd_adda_r_adr__lo/0.txt | 2 - .../system/comet2_cmd/cmd_adda_r_adr__o/0.txt | 2 - .../system/comet2_cmd/cmd_adda_r_adr__z/0.txt | 2 - test/system/comet2_cmd/cmd_adda_r_adr_x/0.txt | 2 - test/system/comet2_cmd/cmd_addl_r1_r2/0.txt | 2 - test/system/comet2_cmd/cmd_addl_r_adr/0.txt | 2 - .../comet2_cmd/cmd_addl_r_adr__ao/0.txt | 2 - .../comet2_cmd/cmd_addl_r_adr__as0/0.txt | 2 - .../comet2_cmd/cmd_addl_r_adr__as1/0.txt | 2 - .../comet2_cmd/cmd_addl_r_adr__az/0.txt | 2 - .../comet2_cmd/cmd_addl_r_adr__lo/0.txt | 2 - .../system/comet2_cmd/cmd_addl_r_adr__o/0.txt | 2 - .../system/comet2_cmd/cmd_addl_r_adr__z/0.txt | 2 - test/system/comet2_cmd/cmd_addl_r_adr_x/0.txt | 2 - test/system/comet2_cmd/cmd_and_r1_r2/0.txt | 2 - test/system/comet2_cmd/cmd_and_r_adr/0.txt | 2 - test/system/comet2_cmd/cmd_and_r_adr__s/0.txt | 2 - test/system/comet2_cmd/cmd_and_r_adr__z/0.txt | 2 - test/system/comet2_cmd/cmd_and_r_adr_x/0.txt | 2 - test/system/comet2_cmd/cmd_call__inner/0.txt | 2 - test/system/comet2_cmd/cmd_call__outer/0.txt | 2 - test/system/comet2_cmd/cmd_cpa_r1_r2__s/0.txt | 2 - test/system/comet2_cmd/cmd_cpa_r_adr/0.txt | 2 - .../system/comet2_cmd/cmd_cpa_r_adr__ls/0.txt | 2 - test/system/comet2_cmd/cmd_cpa_r_adr__s/0.txt | 2 - test/system/comet2_cmd/cmd_cpa_r_adr__z/0.txt | 2 - .../comet2_cmd/cmd_cpa_r_adr_x__s/0.txt | 2 - test/system/comet2_cmd/cmd_cpl_r1_r2__s/0.txt | 2 - test/system/comet2_cmd/cmd_cpl_r_adr/0.txt | 2 - .../system/comet2_cmd/cmd_cpl_r_adr__ls/0.txt | 2 - test/system/comet2_cmd/cmd_cpl_r_adr__s/0.txt | 2 - test/system/comet2_cmd/cmd_cpl_r_adr__z/0.txt | 2 - .../comet2_cmd/cmd_cpl_r_adr_x__s/0.txt | 2 - test/system/comet2_cmd/cmd_dc__c0/0.txt | 2 - test/system/comet2_cmd/cmd_dc__c1/0.txt | 2 - test/system/comet2_cmd/cmd_dc__i0/0.txt | 2 - test/system/comet2_cmd/cmd_dc__i1/0.txt | 2 - test/system/comet2_cmd/cmd_dc__io/0.txt | 2 - test/system/comet2_cmd/cmd_ds/0.txt | 2 - test/system/comet2_cmd/cmd_ds__0/0.txt | 2 - test/system/comet2_cmd/cmd_in/0.txt | 2 - test/system/comet2_cmd/cmd_in_len10/0.txt | 48 ++++ test/system/comet2_cmd/cmd_in_len10/Makefile | 2 + test/system/comet2_cmd/cmd_in_len10/cmd | 1 + .../comet2_cmd/cmd_in_len10/teststr.txt | 1 + test/system/comet2_cmd/cmd_jmi__m/0.txt | 2 - test/system/comet2_cmd/cmd_jmi__o/0.txt | 2 - test/system/comet2_cmd/cmd_jmi__p/0.txt | 2 - test/system/comet2_cmd/cmd_jmi__z/0.txt | 2 - test/system/comet2_cmd/cmd_jnz__m/0.txt | 2 - test/system/comet2_cmd/cmd_jnz__o/0.txt | 2 - test/system/comet2_cmd/cmd_jnz__p/0.txt | 2 - test/system/comet2_cmd/cmd_jnz__z/0.txt | 2 - test/system/comet2_cmd/cmd_jov__m/0.txt | 2 - test/system/comet2_cmd/cmd_jov__o/0.txt | 2 - test/system/comet2_cmd/cmd_jov__p/0.txt | 2 - test/system/comet2_cmd/cmd_jov__z/0.txt | 2 - test/system/comet2_cmd/cmd_jpl__m/0.txt | 2 - test/system/comet2_cmd/cmd_jpl__o/0.txt | 2 - test/system/comet2_cmd/cmd_jpl__p/0.txt | 2 - test/system/comet2_cmd/cmd_jpl__z/0.txt | 2 - test/system/comet2_cmd/cmd_jump__m/0.txt | 2 - test/system/comet2_cmd/cmd_jump__o/0.txt | 2 - test/system/comet2_cmd/cmd_jump__p/0.txt | 2 - test/system/comet2_cmd/cmd_jump__z/0.txt | 2 - test/system/comet2_cmd/cmd_jze__m/0.txt | 2 - test/system/comet2_cmd/cmd_jze__o/0.txt | 2 - test/system/comet2_cmd/cmd_jze__p/0.txt | 2 - test/system/comet2_cmd/cmd_jze__z/0.txt | 2 - test/system/comet2_cmd/cmd_lad_r_adr/0.txt | 2 - test/system/comet2_cmd/cmd_lad_r_adr_x/0.txt | 2 - .../comet2_cmd/cmd_lad_r_adr_x__o/0.txt | 2 - .../comet2_cmd/cmd_lad_r_adr_x__s/0.txt | 2 - test/system/comet2_cmd/cmd_ld_r1_r2/0.txt | 2 - test/system/comet2_cmd/cmd_ld_r_adr/0.txt | 2 - test/system/comet2_cmd/cmd_ld_r_adr__l/0.txt | 2 - test/system/comet2_cmd/cmd_ld_r_adr_x/0.txt | 2 - test/system/comet2_cmd/cmd_nop/0.txt | 2 - test/system/comet2_cmd/cmd_or_r1_r2/0.txt | 2 - test/system/comet2_cmd/cmd_or_r_adr/0.txt | 2 - test/system/comet2_cmd/cmd_or_r_adr__s/0.txt | 2 - test/system/comet2_cmd/cmd_or_r_adr__z/0.txt | 2 - test/system/comet2_cmd/cmd_or_r_adr_x/0.txt | 2 - test/system/comet2_cmd/cmd_out/0.txt | 2 - test/system/comet2_cmd/cmd_push_pop__0/0.txt | 2 - test/system/comet2_cmd/cmd_push_pop__1/0.txt | 2 - test/system/comet2_cmd/cmd_rpop/0.txt | 2 - test/system/comet2_cmd/cmd_rpush/0.txt | 2 - test/system/comet2_cmd/cmd_sla/0.txt | 2 - test/system/comet2_cmd/cmd_sla__o/0.txt | 2 - test/system/comet2_cmd/cmd_sla__os/0.txt | 2 - test/system/comet2_cmd/cmd_sla__oz/0.txt | 2 - test/system/comet2_cmd/cmd_sla__s/0.txt | 2 - test/system/comet2_cmd/cmd_sla__z/0.txt | 2 - test/system/comet2_cmd/cmd_sll/0.txt | 2 - test/system/comet2_cmd/cmd_sll__o/0.txt | 2 - test/system/comet2_cmd/cmd_sll__os/0.txt | 2 - test/system/comet2_cmd/cmd_sll__oz/0.txt | 2 - test/system/comet2_cmd/cmd_sll__s/0.txt | 2 - test/system/comet2_cmd/cmd_sll__z/0.txt | 2 - test/system/comet2_cmd/cmd_sra/0.txt | 2 - test/system/comet2_cmd/cmd_sra__o/0.txt | 2 - test/system/comet2_cmd/cmd_sra__os/0.txt | 2 - test/system/comet2_cmd/cmd_sra__oz/0.txt | 2 - test/system/comet2_cmd/cmd_sra__s/0.txt | 2 - test/system/comet2_cmd/cmd_sra__z/0.txt | 2 - test/system/comet2_cmd/cmd_srl/0.txt | 2 - test/system/comet2_cmd/cmd_srl__o/0.txt | 2 - test/system/comet2_cmd/cmd_srl__oz/0.txt | 2 - test/system/comet2_cmd/cmd_srl__s/0.txt | 2 - test/system/comet2_cmd/cmd_srl__z/0.txt | 2 - test/system/comet2_cmd/cmd_st_r_adr/0.txt | 2 - test/system/comet2_cmd/cmd_st_r_adr_x/0.txt | 2 - test/system/comet2_cmd/cmd_suba_r1_r2/0.txt | 2 - test/system/comet2_cmd/cmd_suba_r_adr/0.txt | 2 - .../comet2_cmd/cmd_suba_r_adr__ao/0.txt | 2 - .../comet2_cmd/cmd_suba_r_adr__as0/0.txt | 2 - .../comet2_cmd/cmd_suba_r_adr__as1/0.txt | 2 - .../comet2_cmd/cmd_suba_r_adr__lo/0.txt | 2 - .../system/comet2_cmd/cmd_suba_r_adr__o/0.txt | 2 - .../system/comet2_cmd/cmd_suba_r_adr__z/0.txt | 2 - test/system/comet2_cmd/cmd_suba_r_adr_x/0.txt | 2 - test/system/comet2_cmd/cmd_subl_r1_r2/0.txt | 2 - test/system/comet2_cmd/cmd_subl_r_adr/0.txt | 2 - .../comet2_cmd/cmd_subl_r_adr__ao/0.txt | 2 - .../comet2_cmd/cmd_subl_r_adr__as0/0.txt | 2 - .../comet2_cmd/cmd_subl_r_adr__as1/0.txt | 2 - .../comet2_cmd/cmd_subl_r_adr__lo/0.txt | 2 - .../system/comet2_cmd/cmd_subl_r_adr__o/0.txt | 2 - .../system/comet2_cmd/cmd_subl_r_adr__z/0.txt | 2 - test/system/comet2_cmd/cmd_subl_r_adr_x/0.txt | 2 - test/system/comet2_cmd/cmd_svc__1/0.txt | 2 - test/system/comet2_cmd/cmd_svc__2/0.txt | 2 - test/system/comet2_cmd/cmd_xor_r1_r2/0.txt | 2 - .../comet2_cmd/cmd_xor_r1_r2__clear/0.txt | 2 - test/system/comet2_cmd/cmd_xor_r_adr/0.txt | 2 - test/system/comet2_cmd/cmd_xor_r_adr__s/0.txt | 2 - test/system/comet2_cmd/cmd_xor_r_adr__z/0.txt | 2 - test/system/comet2_cmd/cmd_xor_r_adr_x/0.txt | 2 - test/system/comet2_err/err_209/0.txt | 2 +- test/system/comet2_err/err_209_len11/0.txt | 31 +++ test/system/comet2_err/err_209_len11/Makefile | 2 + test/system/comet2_err/err_209_len11/cmd | 1 + .../comet2_err/err_209_len11/teststr.txt | 1 + test/system/comet2_opt/opt__T/0.txt | 2 - test/system/comet2_opt/opt_t/0.txt | 2 - test/system/comet2_opt/opt_td/0.txt | 2 - test/system/comet2_smoke/direct/0.txt | 2 - test/system/comet2monitor/opt_r/0.txt | 14 +- test/system/comet2monitor/opt_t/0.txt | 2 - test/system/comet2monitor/opt_tl/0.txt | 2 - 332 files changed, 501 insertions(+), 750 deletions(-) create mode 100644 as/cmd/IN/in_len10.casl create mode 100644 as/sample/ldlad0.casl create mode 100644 as/sample/ldlad2.casl create mode 100644 test/system/casl2_cmd/cmd_in_len10/0.txt create mode 100644 test/system/casl2_cmd/cmd_in_len10/Makefile create mode 100755 test/system/casl2_cmd/cmd_in_len10/cmd create mode 100644 test/system/casl2_cmd/cmd_in_len10/teststr.txt create mode 100644 test/system/casl2_cmd/cmd_in_overflow/0.txt create mode 100644 test/system/casl2_cmd/cmd_in_overflow/Makefile create mode 100755 test/system/casl2_cmd/cmd_in_overflow/cmd create mode 100644 test/system/casl2_cmd/cmd_in_overflow/teststr.txt create mode 100644 test/system/comet2_cmd/cmd_in_len10/0.txt create mode 100644 test/system/comet2_cmd/cmd_in_len10/Makefile create mode 100755 test/system/comet2_cmd/cmd_in_len10/cmd create mode 100644 test/system/comet2_cmd/cmd_in_len10/teststr.txt create mode 100644 test/system/comet2_err/err_209_len11/0.txt create mode 100644 test/system/comet2_err/err_209_len11/Makefile create mode 100755 test/system/comet2_err/err_209_len11/cmd create mode 100644 test/system/comet2_err/err_209_len11/teststr.txt diff --git a/Makefile b/Makefile index 30ca78e..c27b264 100644 --- a/Makefile +++ b/Makefile @@ -81,8 +81,10 @@ install-info: uninstall: uninstall-info $(RM) $(prefix $(bindir)/,$(CMDFILES)) -version: $(VERSIONFILES) - @$(ECHO) "YACASL2 Version: $(VERSION)" +version: version___stamp + +version___stamp: $(VERSIONFILES) + @$(PRINTF) "YACASL2 Version: %s\n" $(VERSION) >$@ $(VERSIONFILES): VERSION @$(SED) -e "s/@@VERSION@@/$(VERSION)/g" $@.version >$@ diff --git a/VERSION b/VERSION index 64b5b19..f7191bb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -v0.5p58 +v0.6p00 diff --git a/as/cmd/IN/in_len10.casl b/as/cmd/IN/in_len10.casl new file mode 100644 index 0000000..ecc3fca --- /dev/null +++ b/as/cmd/IN/in_len10.casl @@ -0,0 +1,7 @@ +;;; casl2 -M32 err_208.casl }をWORD（16ビット @item -C @var{CLOCKS} @itemx --clocks=@var{CLOCKS} -クロック数を指定します。 +COMET II実行時のクロック周波数@option{}を0より大きい整数で指定します。 +指定しない場合、5000000です。 @item -v @itemx --version @@ -980,11 +988,12 @@ COMET II実行時のメモリサイズ@option{}をWORD（16ビット @item n @itemx next 現在のPRアドレスの命令を1つ実行します。 -実行後、逆アセンブル・レジスタ・メモリが自動表示設定に従い表示されます。 +実行後、レジスタ・メモリ・逆アセンブルが自動表示設定に従い表示されます。 @item c @itemx continue プログラムが終了するか、ブレークポイントに達するまで実行します。 +実行中、各ステップで逆アセンブルが自動表示設定に従い表示されます。 @end table @subsection 表示コマンド @@ -996,7 +1005,7 @@ COMET II実行時のメモリサイズ@option{}をWORD（16ビット 引数なしではロードされたプログラム全体を表示します。 @example -r +r @var{start} @var{end} @end example アドレスを指定した場合は、@var{start}から@var{end}の範囲を表示します。 @@ -1030,15 +1039,16 @@ CPUレジスタの内容を論理（符号なし）表現で表示します。 @item d @itemx dump メモリダンプを表示します。 -引数なしでは、ロードされたプログラムの範囲を表示します。 +引数なしでは@code{#0000}から@code{#0040}の範囲を表示します。 +メモリサイズが@code{#0040}より小さい場合はメモリ全体を表示します。 @example -d -d -d + +d @var{start} +d @var{start} @var{end} +d @var{start} +@var{length} @end example -@var{start}を指定した場合は@var{start}から@code{#0040}語分、 +@var{start}のみ指定した場合は@var{start}から@code{#0040}語分、 @var{end}も指定した場合は@var{start}から@var{end}の範囲を表示します。 @code{+}を付けた場合は@var{start}から@var{length}語分を表示します。 @@ -1101,30 +1111,32 @@ CPUとメモリをリセットします。 @node comet2monitor examples, , monitor commands, comet2monitor-invocation @section 使用例 -@code{ldlad.o}を逆アセンブル表示つきで起動し、ステップ実行します。 +@file{ldlad.o}をオプションなしで起動し、ステップ実行します。 +デフォルトで逆アセンブルの自動表示がONのため、起動時にプログラム全体の逆アセンブル結果と、 +最初に実行される命令が表示されます。 @example -$ comet2monitor -M16 as/sample/ldlad.o -Disassemble:::: - LD GR1,#000B ; #0000: #1010 #000B +$ @kbd{comet2monitor -M32 as/sample/ldlad.o} + LAD GR1,#0001 ; #0000: #1210 #0001 LAD GR2,#000B ; #0002: #1220 #000B - LAD GR3,#0001 ; #0004: #1230 #0001 - ST GR1,#000C ; #0006: #1110 #000C - ST GR2,#000C,GR3 ; #0008: #1123 #000C + LD GR3,#000B ; #0004: #1030 #000B + ST GR2,#000C ; #0006: #1120 #000C + ST GR3,#000C,GR1 ; #0008: #1131 #000C RET ; #000A: #8100 -#0000: Disassemble:::: - LD GR1,#000B ; #0000: #1010 #000B + DC 3 ; #000B: #0003 :: 3 = #0003 = 0000000000000011 + DC 0 ; #000C: #0000 :: 0 = #0000 = 0000000000000000 + DC 0 ; #000D: #0000 :: 0 = #0000 = 0000000000000000 + DC 0 ; #000E: #0000 :: 0 = #0000 = 0000000000000000 +#0000: Disassemble:::: LAD GR1,#0001 ; #0000: #1210 #0001 COMET II machine code monitor. Type ? for help. (comet2 monitor) n > n -#0002: Disassemble:::: - LAD GR2,#000B ; #0002: #1220 #000B +#0002: Disassemble:::: LAD GR2,#000B ; #0002: #1220 #000B (comet2 monitor) n > n -#0004: Disassemble:::: - LAD GR3,#0001 ; #0004: #1230 #0001 +#0004: Disassemble:::: LD GR3,#000B ; #0004: #1030 #000B (comet2 monitor) q > q @@ -1134,7 +1146,7 @@ Quit: COMET II monitor レジスタトレースとメモリダンプを追加して起動する場合は@option{-T}と@option{-d}を指定します。 @example -$ comet2monitor -Td -M16 as/sample/ldlad.o +$ @kbd{comet2monitor -Td -M32 as/sample/ldlad.o} @end example 逆アセンブルの自動表示をOFFにして最後まで一気に実行する場合は、 diff --git a/include/disassemble.h b/include/disassemble.h index 849f4d6..0a0d316 100644 --- a/include/disassemble.h +++ b/include/disassemble.h @@ -7,18 +7,17 @@ /** * @brief CASL IIのオブジェクトファイルを逆アセンブルし、標準出力へ出力する * - * @return 正常終了時は0、異常終了時は0以外 - * * @param *file オブジェクトファイルのファイル名 */ -bool disassemble_file(const char *file); +void disassemble_file(const char *file); /** - * @brief COMET IIのメモリーを逆アセンブルし、標準出力へ出力する + * @brief メモリーを逆アセンブルし、標準出力へ出力する * + * @param *memory メモリー * @param *start 逆アセンブルの開始位置 * @param *end 逆アセンブルの終了位置 */ -void disassemble_memory(WORD start, WORD end); +void disassemble_memory(WORD *memory, WORD start, WORD end); #endif diff --git a/src/casl2rev.c b/src/casl2rev.c index acf986d..0bc57f6 100644 --- a/src/casl2rev.c +++ b/src/casl2rev.c @@ -52,11 +52,13 @@ int main(int argc, char *argv[]) fprintf(stderr, "disassemble error - %d: %s\n", cerr->num, cerr->msg); goto casl2revfin; } - disassemble_file(argv[optind]); /* プログラム実行 */ + create_cmdtable(HASH_CODE); /* 命令コードがキーのハッシュ表を作成 */ + disassemble_file(argv[optind]); /* プログラム実行 */ casl2revfin: if(cerr->num > 0) { stat = 1; } - freecerr(); /* エラーの解放 */ + free_cmdtable(HASH_CODE); /* 命令のコードとタイプがキーのハッシュ表を解放 */ + freecerr(); /* エラーの解放 */ return stat; } diff --git a/src/disassemble.c b/src/disassemble.c index 2fcc604..a76b120 100644 --- a/src/disassemble.c +++ b/src/disassemble.c @@ -15,20 +15,15 @@ int codecol = 32; WORD fgetword(FILE *stream); /** - * @brief ファイルストリームを1ワード戻す - * - * @param stream ファイルストリーム - */ -void fungetword(FILE *stream); - -/** - * @brief ファイルストリームから、値が0の連続するWORD数を返す + * @brief WORDデータから、値が0のWORDがいくつ連続するか返す * + * @param words WORDデータ + * @param wardlen データのWORD数 * @return 値が0の連続するWORD数 * * @param stream ファイルストリーム */ -WORD zero_data_cnt(FILE *stream); +WORD zero_data_cnt(const WORD *data, WORD wordlen); /** * @brief 機械コードをコメントとして標準出力へ出力する @@ -80,6 +75,7 @@ void disassemble_puts_code(int ascol, WORD pradr, int wordc, WORD wordv[]) fprintf(stdout, "; #%04X: #%04X #%04X", pradr, wordv[0], wordv[1]); } } + void disassemble_cmd_adr_x(CMDTYPE cmdtype, const char *cmdname, WORD word, WORD adr, WORD pradr) { WORD x = 0; @@ -150,108 +146,72 @@ WORD fgetword(FILE *stream) return aword; } -void fungetword(FILE *stream) +WORD zero_data_cnt(const WORD *data, WORD wordlen) { - fseek(stream, -sizeof(WORD), SEEK_CUR); -} - -WORD zero_data_cnt(FILE *stream) -{ - WORD cnt = 0; - WORD word = 0; - - while(!feof(stream) && word == 0) { - word = fgetword(stream); + WORD cnt = 1; + while(cnt < wordlen && data[cnt] == 0) cnt++; - } - if(!feof(stream)) { - fungetword(stream); - } return cnt; } -bool disassemble_file(const char *file) +void disassemble_file(const char *file) { - bool stat = true; + WORD *buf = NULL; + int len = 0; FILE *fp = NULL; - WORD i = 0; - WORD word = 0; - WORD cmd = 0; - WORD zcnt = 0; - CMDTYPE cmdtype = 0; - const char *cmdname = NULL; - bool inst = true; assert(file != NULL); if((fp = fopen(file, "rb")) == NULL) { perror(file); - return false; } - create_cmdtable(HASH_CODE); /* 命令のコードとタイプがキーのハッシュ表を作成 */ - - fprintf(stdout, "MAIN START\n"); - for(word = fgetword(fp); !feof(fp); i++, word = fgetword(fp)) { - cmd = word & 0xFF00; - cmdname = getcmdname(cmd); - cmdtype = getcmdtype(cmd); - if(word == 0){ - if(inst == true) { /* プログラム領域の場合 */ - disassemble_cmd_r(NONE, "nop", 0, i); - } else { /* データ領域の場合 */ - zcnt = zero_data_cnt(fp); - if(zcnt == 1) { /* 1つだけの0はDCとみなす */ - disassemble_dc(0, i); - } else { /* 連続する0はDSとみなす */ - disassemble_ds(zcnt, i); - i += zcnt - 1; - } - } - } else if(cmd == 0 || cmdname ==NULL) { - disassemble_dc(word, i); - } else { - if(cmdtype == R_ADR_X || cmdtype == ADR_X) { - disassemble_cmd_adr_x(cmdtype, cmdname, word, fgetword(fp), i++); - } else { - disassemble_cmd_r(cmdtype, cmdname, word, i); - } - inst = (cmd != 0x8100) ? true : false; - } - fprintf(stdout, "\n"); + buf = calloc_chk(MAX_MEMSIZE, sizeof(WORD), "disassemble_file"); + for(int i = 0; !feof(fp) && i < MAX_MEMSIZE; i++) { + buf[i] = fgetword(fp); + len = i; } - fprintf(stdout, " END\n"); - free_cmdtable(HASH_CODE); + len--; fclose(fp); - return stat; + fprintf(stdout, "MAIN START\n"); + disassemble_memory(buf, 0, len); + fprintf(stdout, " END\n"); } -void disassemble_memory(WORD start, WORD end) +void disassemble_memory(WORD *memory, WORD start, WORD end) { WORD cmd = 0; CMDTYPE cmdtype = 0; const char *cmdname = NULL; - bool inst = true; + bool inprogram = true; + WORD zcnt = 0; for(int i = start; i <= end; i++) { - cmd = sys->memory[i] & 0xFF00; + cmd = memory[i] & 0xFF00; cmdname = getcmdname(cmd); cmdtype = getcmdtype(cmd); - if(sys->memory[i] == 0) { - if(inst == true) { /* プログラム領域の場合 */ + if(memory[i] == 0) { + if(inprogram == true) { /* プログラム領域の場合 */ disassemble_cmd_r(NONE, "nop", 0, i); - } else { /* データ領域の場合。メモリーでは、DC 0とみなす */ - disassemble_dc(0, i); + } else { /* データ領域の場合 */ + zcnt = zero_data_cnt(memory+i, end-i+1); + /* fprintf(stdout, "DEBUG:::: i:%d; end:%04X\n", i, end); */ + if(zcnt == 1) { /* 1つだけの0はDCとみなす */ + disassemble_dc(0, i); + } else { /* 連続する0はDSとみなす */ + disassemble_ds(zcnt, i); + i += zcnt - 1; + } } - } else if(cmd == 0) { - disassemble_dc(sys->memory[i], i); + } else if(cmd == 0 || cmdname ==NULL) { + disassemble_dc(memory[i], i); } else { if(cmdtype == R_ADR_X || cmdtype == ADR_X) { - disassemble_cmd_adr_x(cmdtype, cmdname, sys->memory[i], sys->memory[i+1], i); + disassemble_cmd_adr_x(cmdtype, cmdname, memory[i], memory[i+1], i); i++; } else { - disassemble_cmd_r(cmdtype, cmdname, sys->memory[i], i); + disassemble_cmd_r(cmdtype, cmdname, memory[i], i); } - inst = (cmd != 0x8100) ? true : false; + inprogram = (cmd != 0x8100) ? true : false; } fprintf(stdout, "\n"); } diff --git a/src/dump.c b/src/dump.c index 343cced..91f4e0c 100644 --- a/src/dump.c +++ b/src/dump.c @@ -62,8 +62,7 @@ void dsp_trace_dump() { if(execptr->stop == false && (execmode.dump == true || execmode.trace == true || execmode.reverse == true)) { /* traceまたはdumpオプション指定時、改行を出力 */ if(sys->cpu->pr == execptr->start && execmode.reverse == true) { /* reverseオプション指定時、スタート時にプログラム全体を逆アセンブル */ - fprintf(stdout, "Disassemble::::\n"); - disassemble_memory(execptr->start, execptr->end); + disassemble_memory(sys->memory, execptr->start, (execptr->end)-1); } if(execmode.trace == true) { /* traceオプション指定時、レジスタを出力 */ fprintf(stdout, "#%04X: Register::::\n", sys->cpu->pr); @@ -74,8 +73,8 @@ void dsp_trace_dump() dumpmemory(execmode.dump_start, execmode.dump_end); } if(execmode.reverse == true) { /* reverseオプション指定時、ステップごとに語長分を逆アセンブル */ - fprintf(stdout, "#%04X: Disassemble::::\n", sys->cpu->pr); - disassemble_memory(sys->cpu->pr, sys->cpu->pr + code2cmdwordlen(sys->memory[sys->cpu->pr] & 0xFF00) - 1); + fprintf(stdout, "#%04X: Disassemble::::", sys->cpu->pr); + disassemble_memory(sys->memory, sys->cpu->pr, sys->cpu->pr + code2cmdwordlen(sys->memory[sys->cpu->pr] & 0xFF00) - 1); } fprintf(stdout, "\n"); } diff --git a/src/exec.c b/src/exec.c index 15df261..dc2b2dc 100644 --- a/src/exec.c +++ b/src/exec.c @@ -120,7 +120,7 @@ void svcin() if(!buf[i] || buf[i] == '\n') { break; } - if(sys->cpu->gr[1] + i > execptr->end) { + if(sys->cpu->gr[1] + i >= execptr->end) { setcerr(208, ""); /* SVC input - memory overflow */ break; } @@ -136,7 +136,7 @@ void svcout() WORD w; for(i = 0; i < sys->memory[sys->cpu->gr[2]]; i++) { - if(sys->cpu->gr[1] + i > execptr->end) { + if(sys->cpu->gr[1] + i >= execptr->end) { setcerr(209, ""); /* SVC output - memory overflow */ return; } @@ -689,11 +689,8 @@ void exec() char *s = NULL; const char *monmsg = "COMET II machine code monitor. Type ? for help.\n"; - create_cmdtable(HASH_CODE); /* 命令のコードとタイプがキーのハッシュ表を作成 */ + create_cmdtable(HASH_CODE); /* 命令コードがキーのハッシュ表を作成 */ - if(execmode.trace == true) { - fprintf(stdout, "\nExecuting machine codes\n"); - } /* 機械語の実行 */ for (sys->cpu->pr = execptr->start; ; ) { clock_begin = clock(); /* クロック周波数設定のため、実行開始時間を格納 */ diff --git a/src/monitor.c b/src/monitor.c index 82dcbbb..5dd7d95 100644 --- a/src/monitor.c +++ b/src/monitor.c @@ -306,9 +306,9 @@ MONCMDTYPE monitorcmd(char *cmd, MONARGS *args) } else if(args->argc > 0 && stracmp(args->argv[0], 2, (char* []){"n", "noauto"})) { execmode.reverse = false; } else if(args->argc == 2) { - disassemble_memory(nh2word(args->argv[0]), nh2word(args->argv[1])); + disassemble_memory(sys->memory, nh2word(args->argv[0]), nh2word(args->argv[1])); } else { - disassemble_memory(execptr->start, execptr->end); + disassemble_memory(sys->memory, execptr->start, (execptr->end)-1); } } else if(stracmp(cmd, 1, (char* []){"reset"})) { fprintf(stdout, "Reset COMET II CPU.\n"); diff --git a/test/system/casl2_cmd/cmd_adda_r1_r2/0.txt b/test/system/casl2_cmd/cmd_adda_r1_r2/0.txt index 28b397f..223616b 100644 --- a/test/system/casl2_cmd/cmd_adda_r1_r2/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r1_r2/0.txt @@ -180,8 +180,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r1_r2.casl (1) ../../../../as/cmd/ADDA/adda_r1_r2.casl: 82: RET #005E #8100 ../../../../as/cmd/ADDA/adda_r1_r2.casl: 83: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_adda_r_adr/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr/0.txt index 0912dc9..1177004 100644 --- a/test/system/casl2_cmd/cmd_adda_r_adr/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r_adr/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r_adr.casl (1) ../../../../as/cmd/ADDA/adda_r_adr.casl: 7:B DC 1 #0006 #0001 ../../../../as/cmd/ADDA/adda_r_adr.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt index ae57ee6..cdf4824 100644 --- a/test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r_adr___o/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r_adr__o.casl (1) ../../../../as/cmd/ADDA/adda_r_adr__o.casl: 7:B DC #8001 ; -32767 #0006 #8001 ../../../../as/cmd/ADDA/adda_r_adr__o.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt index 10a1de2..9bd4b24 100644 --- a/test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r_adr___z/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r_adr__z.casl (1) ../../../../as/cmd/ADDA/adda_r_adr__z.casl: 7:B DC 0 #0006 #0000 ../../../../as/cmd/ADDA/adda_r_adr__z.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt index 2ea2abb..4cd4fe3 100644 --- a/test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r_adr__ao/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r_adr__ao.casl (1) ../../../../as/cmd/ADDA/adda_r_adr__ao.casl: 7:B DC #000A ; 10 #0006 #000A ../../../../as/cmd/ADDA/adda_r_adr__ao.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt index 8a76a22..e532074 100644 --- a/test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r_adr__as0/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r_adr__as0.casl (1) ../../../../as/cmd/ADDA/adda_r_adr__as0.casl: 7:B DC #FFEC ; -20 #0006 #FFEC ../../../../as/cmd/ADDA/adda_r_adr__as0.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt index 8378443..ba5b841 100644 --- a/test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r_adr__as1/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r_adr__as1.casl (1) ../../../../as/cmd/ADDA/adda_r_adr__as1.casl: 7:B DC #000A ; 10 #0006 #000A ../../../../as/cmd/ADDA/adda_r_adr__as1.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt index 3fb7811..fa28e91 100644 --- a/test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r_adr__az/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r_adr__az.casl (1) ../../../../as/cmd/ADDA/adda_r_adr__az.casl: 7:B DC 10 #0006 #000A ../../../../as/cmd/ADDA/adda_r_adr__az.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt index dc96ca8..8947ee2 100644 --- a/test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r_adr__lo/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r_adr__lo.casl (1) ../../../../as/cmd/ADDA/adda_r_adr__lo.casl: 7:B DC #000F ; 15 #0006 #000F ../../../../as/cmd/ADDA/adda_r_adr__lo.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt index 94b0a33..c40fee3 100644 --- a/test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt +++ b/test/system/casl2_cmd/cmd_adda_r_adr_x/0.txt @@ -20,8 +20,6 @@ Assemble ../../../../as/cmd/ADDA/adda_r_adr_x.casl (1) ../../../../as/cmd/ADDA/adda_r_adr_x.casl: 8: DC 1 #0008 #0001 ../../../../as/cmd/ADDA/adda_r_adr_x.casl: 9: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_addl_r1_r2/0.txt b/test/system/casl2_cmd/cmd_addl_r1_r2/0.txt index 6157553..5e05e2a 100644 --- a/test/system/casl2_cmd/cmd_addl_r1_r2/0.txt +++ b/test/system/casl2_cmd/cmd_addl_r1_r2/0.txt @@ -19,8 +19,6 @@ Assemble ../../../../as/cmd/ADDL/addl_r1_r2.casl (1) ../../../../as/cmd/ADDL/addl_r1_r2.casl: 8:B DC 1 #0007 #0001 ../../../../as/cmd/ADDL/addl_r1_r2.casl: 9: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_addl_r_adr/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr/0.txt index e801f29..d04109e 100644 --- a/test/system/casl2_cmd/cmd_addl_r_adr/0.txt +++ b/test/system/casl2_cmd/cmd_addl_r_adr/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDL/addl_r_adr.casl (1) ../../../../as/cmd/ADDL/addl_r_adr.casl: 7:B DC 1 #0006 #0001 ../../../../as/cmd/ADDL/addl_r_adr.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__ao/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__ao/0.txt index 6b4e2bb..060f61e 100644 --- a/test/system/casl2_cmd/cmd_addl_r_adr__ao/0.txt +++ b/test/system/casl2_cmd/cmd_addl_r_adr__ao/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDL/addl_r_adr__ao.casl (1) ../../../../as/cmd/ADDL/addl_r_adr__ao.casl: 7:B DC #000A ; 10 #0006 #000A ../../../../as/cmd/ADDL/addl_r_adr__ao.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt index 4dabe78..ab82795 100644 --- a/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt +++ b/test/system/casl2_cmd/cmd_addl_r_adr__as0/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDL/addl_r_adr__as0.casl (1) ../../../../as/cmd/ADDL/addl_r_adr__as0.casl: 7:B DC #FFEC ; -20 #0006 #FFEC ../../../../as/cmd/ADDL/addl_r_adr__as0.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__as1/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__as1/0.txt index 6c7758e..8cfe85d 100644 --- a/test/system/casl2_cmd/cmd_addl_r_adr__as1/0.txt +++ b/test/system/casl2_cmd/cmd_addl_r_adr__as1/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDL/addl_r_adr__as1.casl (1) ../../../../as/cmd/ADDL/addl_r_adr__as1.casl: 7:B DC #000A ; 10 #0006 #000A ../../../../as/cmd/ADDL/addl_r_adr__as1.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt index fb4d0a3..57ccc0e 100644 --- a/test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt +++ b/test/system/casl2_cmd/cmd_addl_r_adr__az/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDL/addl_r_adr__az.casl (1) ../../../../as/cmd/ADDL/addl_r_adr__az.casl: 7:B DC 10 #0006 #000A ../../../../as/cmd/ADDL/addl_r_adr__az.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt index 45f645f..7a3565d 100644 --- a/test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt +++ b/test/system/casl2_cmd/cmd_addl_r_adr__lo/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDL/addl_r_adr__lo.casl (1) ../../../../as/cmd/ADDL/addl_r_adr__lo.casl: 7:B DC #000F ; 15 #0006 #000F ../../../../as/cmd/ADDL/addl_r_adr__lo.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt index 30249a6..f106e77 100644 --- a/test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt +++ b/test/system/casl2_cmd/cmd_addl_r_adr__o/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDL/addl_r_adr__o.casl (1) ../../../../as/cmd/ADDL/addl_r_adr__o.casl: 7:B DC #8001 ; 32769 #0006 #8001 ../../../../as/cmd/ADDL/addl_r_adr__o.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt index 691c3e2..1af209d 100644 --- a/test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt +++ b/test/system/casl2_cmd/cmd_addl_r_adr_x/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/ADDL/addl_r_adr__z.casl (1) ../../../../as/cmd/ADDL/addl_r_adr__z.casl: 7:B DC 0 #0006 #0000 ../../../../as/cmd/ADDL/addl_r_adr__z.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_and_r1_r2/0.txt b/test/system/casl2_cmd/cmd_and_r1_r2/0.txt index dd2a889..46e3a32 100644 --- a/test/system/casl2_cmd/cmd_and_r1_r2/0.txt +++ b/test/system/casl2_cmd/cmd_and_r1_r2/0.txt @@ -19,8 +19,6 @@ Assemble ../../../../as/cmd/AND/and_r1_r2.casl (1) ../../../../as/cmd/AND/and_r1_r2.casl: 8:B DC #4FFF #0007 #4FFF ../../../../as/cmd/AND/and_r1_r2.casl: 9: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_and_r_adr/0.txt b/test/system/casl2_cmd/cmd_and_r_adr/0.txt index f4c2e1e..85c7ea5 100644 --- a/test/system/casl2_cmd/cmd_and_r_adr/0.txt +++ b/test/system/casl2_cmd/cmd_and_r_adr/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/AND/and_r_adr.casl (1) ../../../../as/cmd/AND/and_r_adr.casl: 7:B DC #4FFF #0006 #4FFF ../../../../as/cmd/AND/and_r_adr.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_and_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_and_r_adr__s/0.txt index e02c198..bf31f3f 100644 --- a/test/system/casl2_cmd/cmd_and_r_adr__s/0.txt +++ b/test/system/casl2_cmd/cmd_and_r_adr__s/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/AND/and_r_adr__s.casl (1) ../../../../as/cmd/AND/and_r_adr__s.casl: 7:B DC #FFFF #0006 #FFFF ../../../../as/cmd/AND/and_r_adr__s.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_and_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_and_r_adr__z/0.txt index 90661b1..83aefc4 100644 --- a/test/system/casl2_cmd/cmd_and_r_adr__z/0.txt +++ b/test/system/casl2_cmd/cmd_and_r_adr__z/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/AND/and_r_adr__z.casl (1) ../../../../as/cmd/AND/and_r_adr__z.casl: 7:B DC #FFFE #0006 #FFFE ../../../../as/cmd/AND/and_r_adr__z.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_and_r_adr_x/0.txt b/test/system/casl2_cmd/cmd_and_r_adr_x/0.txt index 2a61e00..794139a 100644 --- a/test/system/casl2_cmd/cmd_and_r_adr_x/0.txt +++ b/test/system/casl2_cmd/cmd_and_r_adr_x/0.txt @@ -20,8 +20,6 @@ Assemble ../../../../as/cmd/AND/and_r_adr_x.casl (1) ../../../../as/cmd/AND/and_r_adr_x.casl: 8: DC #4FFF #0008 #4FFF ../../../../as/cmd/AND/and_r_adr_x.casl: 9: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_call__both/0.txt b/test/system/casl2_cmd/cmd_call__both/0.txt index 2477381..59d332f 100644 --- a/test/system/casl2_cmd/cmd_call__both/0.txt +++ b/test/system/casl2_cmd/cmd_call__both/0.txt @@ -25,8 +25,6 @@ Assemble ../../../../as/cmd/CALL/call__both.casl (1) ../../../../as/cmd/CALL/call__both.casl: 13: RET #0008 #8100 ../../../../as/cmd/CALL/call__both.casl: 14: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_call__inner/0.txt b/test/system/casl2_cmd/cmd_call__inner/0.txt index cbbef61..077825a 100644 --- a/test/system/casl2_cmd/cmd_call__inner/0.txt +++ b/test/system/casl2_cmd/cmd_call__inner/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/CALL/call__inner.casl (1) ../../../../as/cmd/CALL/call__inner.casl: 7: RET #0006 #8100 ../../../../as/cmd/CALL/call__inner.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_call__outer/0.txt b/test/system/casl2_cmd/cmd_call__outer/0.txt index dc0ae95..7da7a7e 100644 --- a/test/system/casl2_cmd/cmd_call__outer/0.txt +++ b/test/system/casl2_cmd/cmd_call__outer/0.txt @@ -19,8 +19,6 @@ Assemble ../../../../as/cmd/CALL/call__outer.casl (1) ../../../../as/cmd/CALL/call__outer.casl: 9: RET #0006 #8100 ../../../../as/cmd/CALL/call__outer.casl: 10: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt b/test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt index 1d48183..8a95e16 100644 --- a/test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt +++ b/test/system/casl2_cmd/cmd_cpa_r1_r2__s/0.txt @@ -19,8 +19,6 @@ Assemble ../../../../as/cmd/CPA/cpa_r1_r2__s.casl (1) ../../../../as/cmd/CPA/cpa_r1_r2__s.casl: 8:B DC #7000 #0007 #7000 ../../../../as/cmd/CPA/cpa_r1_r2__s.casl: 9: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr/0.txt index c31177e..67d04e4 100644 --- a/test/system/casl2_cmd/cmd_cpa_r_adr/0.txt +++ b/test/system/casl2_cmd/cmd_cpa_r_adr/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/CPA/cpa_r_adr.casl (1) ../../../../as/cmd/CPA/cpa_r_adr.casl: 7:B DC #3000 #0006 #3000 ../../../../as/cmd/CPA/cpa_r_adr.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt index 3ad64e9..306fedd 100644 --- a/test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt +++ b/test/system/casl2_cmd/cmd_cpa_r_adr__ls/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/CPA/cpa_r_adr__ls.casl (1) ../../../../as/cmd/CPA/cpa_r_adr__ls.casl: 7:B DC #8000 #0006 #8000 ../../../../as/cmd/CPA/cpa_r_adr__ls.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt index f79191b..871fac3 100644 --- a/test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt +++ b/test/system/casl2_cmd/cmd_cpa_r_adr__s/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/CPA/cpa_r_adr__s.casl (1) ../../../../as/cmd/CPA/cpa_r_adr__s.casl: 7:B DC #7000 #0006 #7000 ../../../../as/cmd/CPA/cpa_r_adr__s.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt index a4b2173..892d107 100644 --- a/test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt +++ b/test/system/casl2_cmd/cmd_cpa_r_adr__z/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/CPA/cpa_r_adr__z.casl (1) ../../../../as/cmd/CPA/cpa_r_adr__z.casl: 7:B DC #5000 #0006 #5000 ../../../../as/cmd/CPA/cpa_r_adr__z.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt b/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt index 1576ae3..4a852bf 100644 --- a/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt +++ b/test/system/casl2_cmd/cmd_cpa_r_adr_x__s/0.txt @@ -20,8 +20,6 @@ Assemble ../../../../as/cmd/CPA/cpa_r_adr_x__s.casl (1) ../../../../as/cmd/CPA/cpa_r_adr_x__s.casl: 8: DC #7000 #0008 #7000 ../../../../as/cmd/CPA/cpa_r_adr_x__s.casl: 9: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt b/test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt index b740e2a..5ca0d3d 100644 --- a/test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt +++ b/test/system/casl2_cmd/cmd_cpl_r1_r2__s/0.txt @@ -19,8 +19,6 @@ Assemble ../../../../as/cmd/CPL/cpl_r1_r2__s.casl (1) ../../../../as/cmd/CPL/cpl_r1_r2__s.casl: 8:B DC #7000 #0007 #7000 ../../../../as/cmd/CPL/cpl_r1_r2__s.casl: 9: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr/0.txt index 5a50150..93ec80f 100644 --- a/test/system/casl2_cmd/cmd_cpl_r_adr/0.txt +++ b/test/system/casl2_cmd/cmd_cpl_r_adr/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/CPL/cpl_r_adr.casl (1) ../../../../as/cmd/CPL/cpl_r_adr.casl: 7:B DC #3000 #0006 #3000 ../../../../as/cmd/CPL/cpl_r_adr.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt index 3d895d0..a605240 100644 --- a/test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt +++ b/test/system/casl2_cmd/cmd_cpl_r_adr__ls/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/CPL/cpl_r_adr__ls.casl (1) ../../../../as/cmd/CPL/cpl_r_adr__ls.casl: 7:B DC #8000 #0006 #8000 ../../../../as/cmd/CPL/cpl_r_adr__ls.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt index cf088eb..3dba936 100644 --- a/test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt +++ b/test/system/casl2_cmd/cmd_cpl_r_adr__s/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/CPL/cpl_r_adr__s.casl (1) ../../../../as/cmd/CPL/cpl_r_adr__s.casl: 7:B DC #7000 #0006 #7000 ../../../../as/cmd/CPL/cpl_r_adr__s.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt index 7ba9aa4..4ec82c5 100644 --- a/test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt +++ b/test/system/casl2_cmd/cmd_cpl_r_adr__z/0.txt @@ -17,8 +17,6 @@ Assemble ../../../../as/cmd/CPL/cpl_r_adr__z.casl (1) ../../../../as/cmd/CPL/cpl_r_adr__z.casl: 7:B DC #5000 #0006 #5000 ../../../../as/cmd/CPL/cpl_r_adr__z.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt b/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt index b9642c4..67c4834 100644 --- a/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt +++ b/test/system/casl2_cmd/cmd_cpl_r_adr_x__s/0.txt @@ -20,8 +20,6 @@ Assemble ../../../../as/cmd/CPL/cpl_r_adr_x__s.casl (1) ../../../../as/cmd/CPL/cpl_r_adr_x__s.casl: 8: DC #7000 #0008 #7000 ../../../../as/cmd/CPL/cpl_r_adr_x__s.casl: 9: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_dc__c0/0.txt b/test/system/casl2_cmd/cmd_dc__c0/0.txt index e39ef05..5dad3e9 100644 --- a/test/system/casl2_cmd/cmd_dc__c0/0.txt +++ b/test/system/casl2_cmd/cmd_dc__c0/0.txt @@ -195,8 +195,6 @@ Assemble ../../../../as/cmd/DC/dc__c0.casl (1) ../../../../as/cmd/DC/dc__c0.casl: 97: DC '~' #005E #007E ../../../../as/cmd/DC/dc__c0.casl: 98: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_dc__c1/0.txt b/test/system/casl2_cmd/cmd_dc__c1/0.txt index 717764e..b05f524 100644 --- a/test/system/casl2_cmd/cmd_dc__c1/0.txt +++ b/test/system/casl2_cmd/cmd_dc__c1/0.txt @@ -105,8 +105,6 @@ Assemble ../../../../as/cmd/DC/dc__c1.casl (1) #005E #007D #005F #007E ../../../../as/cmd/DC/dc__c1.casl: 7: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_dc__c2/0.txt b/test/system/casl2_cmd/cmd_dc__c2/0.txt index 71f8ca5..e795fca 100644 --- a/test/system/casl2_cmd/cmd_dc__c2/0.txt +++ b/test/system/casl2_cmd/cmd_dc__c2/0.txt @@ -8,8 +8,6 @@ Assemble ../../../../as/cmd/DC/dc__c2.casl (1) #0000 #8100 ../../../../as/cmd/DC/dc__c2.casl: 4: DC '' ../../../../as/cmd/DC/dc__c2.casl: 5: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_dc__i0/0.txt b/test/system/casl2_cmd/cmd_dc__i0/0.txt index 7a415ad..0b6dcaf 100644 --- a/test/system/casl2_cmd/cmd_dc__i0/0.txt +++ b/test/system/casl2_cmd/cmd_dc__i0/0.txt @@ -53,8 +53,6 @@ Assemble ../../../../as/cmd/DC/dc__i0.casl (1) ../../../../as/cmd/DC/dc__i0.casl: 26: DC #FFFF #0017 #FFFF ../../../../as/cmd/DC/dc__i0.casl: 27: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_dc__i1/0.txt b/test/system/casl2_cmd/cmd_dc__i1/0.txt index ff122e1..4bdf0ee 100644 --- a/test/system/casl2_cmd/cmd_dc__i1/0.txt +++ b/test/system/casl2_cmd/cmd_dc__i1/0.txt @@ -30,8 +30,6 @@ Assemble ../../../../as/cmd/DC/dc__i1.casl (1) #0015 #000F #0016 #FFFF ../../../../as/cmd/DC/dc__i1.casl: 5: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_dc__io/0.txt b/test/system/casl2_cmd/cmd_dc__io/0.txt index 4ca8c51..210332f 100644 --- a/test/system/casl2_cmd/cmd_dc__io/0.txt +++ b/test/system/casl2_cmd/cmd_dc__io/0.txt @@ -27,8 +27,6 @@ Assemble ../../../../as/cmd/DC/dc__io.casl (1) ../../../../as/cmd/DC/dc__io.casl: 13: DC -131073 ; -65536 * 2 - 1 #000A #FFFF ../../../../as/cmd/DC/dc__io.casl: 14: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_dc_label__both/0.txt b/test/system/casl2_cmd/cmd_dc_label__both/0.txt index ad07d8c..ab7172d 100644 --- a/test/system/casl2_cmd/cmd_dc_label__both/0.txt +++ b/test/system/casl2_cmd/cmd_dc_label__both/0.txt @@ -23,8 +23,6 @@ Assemble ../../../../as/cmd/DC/dc__label_both.casl (1) ../../../../as/cmd/DC/dc__label_both.casl: 10: RET #0009 #8100 ../../../../as/cmd/DC/dc__label_both.casl: 11: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_dc_label__inner/0.txt b/test/system/casl2_cmd/cmd_dc_label__inner/0.txt index 1802af7..d25cf3e 100644 --- a/test/system/casl2_cmd/cmd_dc_label__inner/0.txt +++ b/test/system/casl2_cmd/cmd_dc_label__inner/0.txt @@ -16,8 +16,6 @@ Assemble ../../../../as/cmd/DC/dc__label_inner.casl (1) ../../../../as/cmd/DC/dc__label_inner.casl: 6:ADR2 DC ADR1 #0006 #0005 ../../../../as/cmd/DC/dc__label_inner.casl: 7: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_dc_label__outer/0.txt b/test/system/casl2_cmd/cmd_dc_label__outer/0.txt index 2a87e4c..b45b5fd 100644 --- a/test/system/casl2_cmd/cmd_dc_label__outer/0.txt +++ b/test/system/casl2_cmd/cmd_dc_label__outer/0.txt @@ -21,8 +21,6 @@ Assemble ../../../../as/cmd/DC/dc__label_outer.casl (1) ../../../../as/cmd/DC/dc__label_outer.casl: 9: RET #0008 #8100 ../../../../as/cmd/DC/dc__label_outer.casl: 10: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_ds/0.txt b/test/system/casl2_cmd/cmd_ds/0.txt index 01d1c58..fa6d0a5 100644 --- a/test/system/casl2_cmd/cmd_ds/0.txt +++ b/test/system/casl2_cmd/cmd_ds/0.txt @@ -35,8 +35,6 @@ Assemble ../../../../as/cmd/DS/ds.casl (1) ../../../../as/cmd/DS/ds.casl: 13:E DC #FFFF #0012 #FFFF ../../../../as/cmd/DS/ds.casl: 14: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_ds__0/0.txt b/test/system/casl2_cmd/cmd_ds__0/0.txt index f997700..904f772 100644 --- a/test/system/casl2_cmd/cmd_ds__0/0.txt +++ b/test/system/casl2_cmd/cmd_ds__0/0.txt @@ -16,8 +16,6 @@ Assemble ../../../../as/cmd/DS/ds__0.casl (1) ../../../../as/cmd/DS/ds__0.casl: 7:B DC 15 #0005 #000F ../../../../as/cmd/DS/ds__0.casl: 8: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_in/0.txt b/test/system/casl2_cmd/cmd_in/0.txt index 1d27dda..10fd040 100644 --- a/test/system/casl2_cmd/cmd_in/0.txt +++ b/test/system/casl2_cmd/cmd_in/0.txt @@ -43,8 +43,6 @@ Assemble ../../../../as/cmd/IN/in.casl (1) ../../../../as/cmd/IN/in.casl: 6:ILEN DS 1 #0021 #0000 ../../../../as/cmd/IN/in.casl: 7: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_in_eof/0.txt b/test/system/casl2_cmd/cmd_in_eof/0.txt index 00b54ad..6f7dccb 100644 --- a/test/system/casl2_cmd/cmd_in_eof/0.txt +++ b/test/system/casl2_cmd/cmd_in_eof/0.txt @@ -43,8 +43,6 @@ Assemble ../../../../as/cmd/IN/in.casl (1) ../../../../as/cmd/IN/in.casl: 6:ILEN DS 1 #0021 #0000 ../../../../as/cmd/IN/in.casl: 7: END - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/casl2_cmd/cmd_in_len10/0.txt b/test/system/casl2_cmd/cmd_in_len10/0.txt new file mode 100644 index 0000000..a73f06a --- /dev/null +++ b/test/system/casl2_cmd/cmd_in_len10/0.txt @@ -0,0 +1,52 @@ + +Assemble ../../../../as/cmd/IN/in_len10.casl (0) + +Assemble ../../../../as/cmd/IN/in_len10.casl (1) +#0000: Memory:::: +#0000: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F + ------------------------------------------------------------------------------------- +#0000: 0000: 7001 0000 7002 0000 1210 000E 1220 000D F000 0001 7120 7110 8100 0000 0000 0000 +#0000: 0010: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 + +#0002: Memory:::: +#0002: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F + ------------------------------------------------------------------------------------- +#0002: 0000: 7001 0000 7002 0000 1210 000E 1220 000D F000 0001 7120 7110 8100 0000 0000 0000 +#0002: 0010: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 + +#0004: Memory:::: +#0004: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F + ------------------------------------------------------------------------------------- +#0004: 0000: 7001 0000 7002 0000 1210 000E 1220 000D F000 0001 7120 7110 8100 0000 0000 0000 +#0004: 0010: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 + +#0006: Memory:::: +#0006: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F + ------------------------------------------------------------------------------------- +#0006: 0000: 7001 0000 7002 0000 1210 000E 1220 000D F000 0001 7120 7110 8100 0000 0000 0000 +#0006: 0010: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 + +#0008: Memory:::: +#0008: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F + ------------------------------------------------------------------------------------- +#0008: 0000: 7001 0000 7002 0000 1210 000E 1220 000D F000 0001 7120 7110 8100 0000 0000 0000 +#0008: 0010: 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 0000 + +#000A: Memory:::: +#000A: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F + ------------------------------------------------------------------------------------- +#000A: 0000: 7001 0000 7002 0000 1210 000E 1220 000D F000 0001 7120 7110 8100 000A 0031 0032 +#000A: 0010: 0033 0034 0035 0036 0037 0038 0039 0030 0000 0000 0000 0000 0000 0000 0000 0000 + +#000B: Memory:::: +#000B: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F + ------------------------------------------------------------------------------------- +#000B: 0000: 7001 0000 7002 0000 1210 000E 1220 000D F000 0001 7120 7110 8100 000A 0031 0032 +#000B: 0010: 0033 0034 0035 0036 0037 0038 0039 0030 0000 0000 0000 0000 0000 0000 0000 0000 + +#000C: Memory:::: +#000C: adr : 0000 0001 0002 0003 0004 0005 0006 0007 0008 0009 000A 000B 000C 000D 000E 000F + ------------------------------------------------------------------------------------- +#000C: 0000: 7001 0000 7002 0000 1210 000E 1220 000D F000 0001 7120 7110 8100 000A 0031 0032 +#000C: 0010: 0033 0034 0035 0036 0037 0038 0039 0030 0000 0000 0000 0000 0000 0000 0000 0000 + diff --git a/test/system/casl2_cmd/cmd_in_len10/Makefile b/test/system/casl2_cmd/cmd_in_len10/Makefile new file mode 100644 index 0000000..b6dac59 --- /dev/null +++ b/test/system/casl2_cmd/cmd_in_len10/Makefile @@ -0,0 +1,2 @@ +include ../Define.mk +include ../Test.mk diff --git a/test/system/casl2_cmd/cmd_in_len10/cmd b/test/system/casl2_cmd/cmd_in_len10/cmd new file mode 100755 index 0000000..b0906e4 --- /dev/null +++ b/test/system/casl2_cmd/cmd_in_len10/cmd @@ -0,0 +1 @@ +../../../../casl2 -M32 -d ../../../../as/cmd/IN/in_len10.casl n -#0002: Disassemble:::: - ADDL GR1,#0008 ; #0002: #2210 #0008 +#0002: Disassemble:::: ADDL GR1,#0008 ; #0002: #2210 #0008 > n -#0004: Disassemble:::: - ST GR1,#0009 ; #0004: #1110 #0009 +#0004: Disassemble:::: ST GR1,#0009 ; #0004: #1110 #0009 > n -#0006: Disassemble:::: - RET ; #0006: #8100 +#0006: Disassemble:::: RET ; #0006: #8100 > n Return to top. diff --git a/test/system/comet2monitor/opt_t/0.txt b/test/system/comet2monitor/opt_t/0.txt index 759b718..752abbb 100644 --- a/test/system/comet2monitor/opt_t/0.txt +++ b/test/system/comet2monitor/opt_t/0.txt @@ -1,5 +1,3 @@ - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 diff --git a/test/system/comet2monitor/opt_tl/0.txt b/test/system/comet2monitor/opt_tl/0.txt index 759b718..752abbb 100644 --- a/test/system/comet2monitor/opt_tl/0.txt +++ b/test/system/comet2monitor/opt_tl/0.txt @@ -1,5 +1,3 @@ - -Executing machine codes #0000: Register:::: #0000: GR0: 0 = #0000 = 0000000000000000 #0000: GR1: 0 = #0000 = 0000000000000000 -- 2.47.3