From: j8takagi <j8takagi@nifty.com> Date: Tue, 21 Dec 2010 03:31:42 +0000 (+0900) Subject: Merge branch 'master' of linux X-Git-Tag: v0.1p15~13 X-Git-Url: https://www.j8takagi.net/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d225ac1f580c59da7a063ef52da35c0af254dd3;p=YACASL2.git Merge branch 'master' of linux Conflicts: Makefile as/casl2lib/outl.casl as/casl2lib/str2l.casl test/system/Makefile --- 0d225ac1f580c59da7a063ef52da35c0af254dd3 diff --cc as/casl2lib/str2l.casl index 70532d3,95791f3..d75a2ba --- a/as/casl2lib/str2l.casl +++ b/as/casl2lib/str2l.casl @@@ -1,9 -1,10 +1,10 @@@ -;;; *** This file is auto generated. *** --;;; 0ã65535ã®ç¯å²ã«ããæ´æ°ã®å ¥åãåãä»ãã ;;; 10鲿°ã®æ´æ°ã表ãæååãæ°å¤ã«å¤æ ++;;; æ°å¤ã®ç¯å²ã¯ã0ãã65535 ;;; å ¥å GR1: æååãæ ¼ç´ããã¢ãã¬ã¹ --;;; GR2: æååã®é·ãã1-5ãæ³å® --;;; åºå GR0: æ°å¤ï¼0ã65535ï¼ --;;; æååãé·éããå ´åãæ°å¤ä»¥å¤ã®å ´åã¯ãGR2ã«#FFFFãæ ¼ç´ ++;;; GR2: æååã®é·ããæå¤§5ãã ++;;; åºå GR0: æ°å¤ ++;;; æååãæå¤§é·ãã大ããå ´åãæ°å¤ä»¥å¤ã®å ´åã¯ãGR0ã¯#FFFFãOFã¯1 ++;;; ä¾åããã°ã©ã : MULL STR2L START PUSH 0,GR3 PUSH 0,GR4 @@@ -34,10 -35,10 +35,10 @@@ MUL10 CPA GR4,=1 ; ã«ã JZE NEXT ; (GR4 = 1)ã®å ´åãã«ã¼ãè±åº JMI NEXT ; â CALL MULL ; MULLãå¼ã³åºããGR0 <- GR1 * GR2 -- JOV FIN ; â ++ JOV FIN ; â ãªã¼ãã¼ããã¼æã¯ãããã°ã©ã çµç«¯ã¸ã¸ã£ã³ã LD GR1,GR0 ; GR1 <- GR0 LAD GR4,-1,GR4 ; GR4 <- GR4 -1 -- JUMP MUL10 ; ã«ã¼ãçµç«¯ ++ JUMP MUL10 ; ã«ã¼ãçµç«¯ã¸ã¸ã£ã³ã NEXT LD GR4,NLEN ; GR4 <- NLENã復å ADDL GR3,GR1 ; GR3 <- GR3 + GR1 JOV FIN ; â @@@ -47,16 -48,47 +48,50 @@@ NAN LAD GR2,#FFFF ; GR2 < JUMP FIN ; FINã¸ã¸ã£ã³ã CP LD GR1,GR3 ; GR0 <- GR3 LD GR0,LEN ; GR0 <- LEN -- JUMP FIN --LENOV LAD GR0,#FFFF -- SRA GR0,1 ++ JUMP FIN ; ããã°ã©ã çµç«¯ã¸ã¸ã£ã³ã ++LENOV LAD GR0,#FFFF ; æååãæå¤§é·ãã大ããå ´åãGR0 <- #FFFF ++ SRA GR0,1 ; â ãªã¼ãã¼ããã¼çºç FIN POP GR4 POP GR3 RET ZERO DC '0' NINE DC '9' --MAXLEN DC 10 ; 10æ¡ã®æ°å¤ã¾ã§å ¥åå¯è½ ++MAXLEN DC 5 ; æååã®æå¤§é· STR DS 1 LEN DS 1 NLEN DS 1 END ++<<<<<<< HEAD ++======= + ;;; 0ã65535ã®ç¯å²ã«ããæ£æ°ã®ããç®ï¼çç®æ¹å¼ï¼ãè¡ã + ;;; å ¥å GR1:è¢«ä¹æ° GR2:乿° + ;;; åºå GR0:ç© + ;;; ç©ã65535ãã大ããå ´åã¯ãGR0ã¯ç©ã®ä¸ä½16ãããã«ãªãããªã¼ãã¼ããã¼ + MULL START + PUSH 0,GR1 + PUSH 0,GR3 + XOR GR0,GR0 ; ç© + AND GR1,GR1 ; (GR1 = 0)ã®å ´åãçµäº + JZE FIN ; â + AND GR2,GR2 ; (GR2 = 0)ã®å ´åãçµäº + JZE FIN ; â + LAD GR3,1 ; 対象ããã + LOOP PUSH 0,GR3 ; ã«ã¼ãå é ãGR2ã®ãããä¸ã§GR3ã示ããããã0ã®å ´åãNEXTã¸ã¸ã£ã³ã + AND GR3,GR2 ; â + POP GR3 ; â + JZE NEXT ; â + ADDL GR0,GR1 ; GR0 <- GR0 + GR1 + JOV FIN ; GR0ããªã¼ãã¼ããã¼ããå ´åãã«ã¼ãè±åº + NEXT SLL GR3,1 ; GR3ã1åå·¦ã·ãã + AND GR3,GR3 ; (GR3 = 0)ã®å ´åãã«ã¼ãè±åº + JZE FIN ; â + CPL GR3,GR2 ; (GR3 > GR2)ã®å ´åãã«ã¼ãè±åº + JPL FIN ; â + SLL GR1,1 ; GR1ã1åå·¦ã·ãã + JOV FIN ; GR1ããªã¼ãã¼ããã¼ããå ´åãã«ã¼ãè±åº + JUMP LOOP ; ã«ã¼ãçµç«¯ + FIN POP GR3 + POP GR1 + RET + END ++>>>>>>> b22ffc2662e5fe300bfab3adb46ca97b5b630d8b diff --cc as/err/a.o index eb53e2d,eb53e2d..0000000 deleted file mode 100644,100644 Binary files differ diff --cc test/system/casl2/Test.mk index edfa278,023bce0..c231512 --- a/test/system/casl2/Test.mk +++ b/test/system/casl2/Test.mk @@@ -27,11 -31,11 +31,11 @@@ checkall: clean $(DETAIL_FILE) $(TIME_F @$(CAT) $(TIME_FILE) >>$(LOG_FILE) @$(call disp_test_log,$(LOG_FILE)) --set: $(TEST0_FILE) ++set: + @-$(call exec_cmd,$^,$@,$(ERR_FILE)) @$(CAT) $^ - reset: cleanall $(TEST0_FILE) - @$(CAT) $(TEST0_FILE) + reset: cleanall set time: cleantime $(TIME_FILE)