еще правки для 5 лабы

Author: HackMemory0

bcomp-assembler/src/main/antlr4/ru.ifmo.cs.bcomp.grammar/BCompNG.g4

@@ -43,6 +43,16 @@ wordArguments
 wordArgument
    : number
    | '$' label
+   | dupArgument
+   | '?'
+   ;
+
+dupArgument
+   : count dup '(' wordArgument ')'
+   ;
+
+count
+   : number
    ;
 
 lbl
@@ -120,18 +130,20 @@ comment
 
 addr: AND | OR | ADD | ADC | SUB | CMP | LOOP | LD | SWAM | JUMP | CALL | ST;
 nonaddr: NOP | HLT | CLA | NOT | CLC | CMC | ROL | ROR | ASL | ASR | SXTB | SWAB |
-         INC | DEC | NEG | POP | POPF | RET | IRET | PUSH | PUSHF | SWAP;
+         INC | DEC | NEG | POP | POPF | RET | IRET | PUSH | PUSHF | SWAP |
+         EI  | DI;
 branch: BEQ | BNE | BMI | BPL | BCS | BCC | BVS | BVC | BLT | BGE | BR;
-io: CLF | TSF | IN | OUT;
+io:  IN | OUT | INT;
 
 sp: SP;
 ip: IP;
 
 org: ORG;
 word: WORD;
+dup: DUP;
 end: END;
 
-fragment A : ('a' | 'A'); 
+fragment A : ('a' | 'A');
 fragment B : ('b' | 'B');
 fragment C : ('c' | 'C');
 fragment D : ('d' | 'D');
@@ -158,7 +170,7 @@ fragment X : ('x' | 'X');
 fragment Y : ('y' | 'Y');
 fragment Z : ('z' | 'Z');
 
-fragment RA : ('а' | 'А'); 
+fragment RA : ('а' | 'А');
 fragment RB : ('б' | 'Б');
 fragment RV : ('в' | 'В');
 fragment RG : ('г' | 'Г');
@@ -201,6 +213,7 @@ fragment P0D : '0' D ;
 ORG: O R G;
 WORD: W O R D;
 END: E N D;
+DUP: ( D U P ) | ( D U P L I C A T E );
 
 /*
 * opcodes
@@ -229,9 +242,9 @@ ROL: ( R O L ) ;
 ROR: ( R O R ) ;
 ASL: ( A S L ) ;
 ASR: ( A S R ) ;
-SXTB: ( S X T B ) ; 
+SXTB: ( S X T B ) ;
 SWAB: ( S W A B ) ;
-INC: ( I N C ) ; 
+INC: ( I N C ) ;
 DEC: ( D E C ) ;
 NEG: ( N E G ) ;
 POP: ( P O P ) ;
@@ -244,7 +257,7 @@ SWAP: ( S W A P ) ;
 
 BEQ: ( B E Q ) | ( B Z S );
 BNE: ( B N E ) | ( B Z C );
-BMI: ( B M I ) | ( B N S ); 
+BMI: ( B M I ) | ( B N S );
 BPL: ( B P L ) | ( B N C );
 BCS: ( B C S ) | ( B L O );
 BCC: ( B C C ) | ( B H I S );
@@ -255,24 +268,28 @@ BGE: ( B G E ) ;
 BR: ( B R ) ;    //syntetic insturction, jump with direct relative addressing mode
 
 
-CLF: ( C L F ) ;
-TSF: ( T S F ) ;
+DI: ( D I ) ;
+EI: ( E I ) ;
 IN: ( I N ) ;
 OUT: ( O U T ) ;
+INT: ( I N T ) ;
 
 SP: ( S P ) ;
 IP: ( I P ) ;
 
 NAME
-   : [a-zA-Zа-яА-Я] [a-zA-Zа-яА-Я0-9."]*
+   : [a-zA-Zа-яА-Я_] [a-zA-Zа-яА-Я_0-9."]*
    ;
 
 DECIMAL
-   : P0D? DECDIGIT+
+   : ( P0D? DECDIGIT+ )
+   | ( '-' P0D? DECDIGIT+ )
+   | ( P0D? '-' DECDIGIT+ )
    ;
 
 HEX
    : HEXDIGIT+ | (P0X HEXDIGIT+ ) | ( HEXDIGIT+ H )
+   | ( '-' HEXDIGIT+ ) | ( '-' P0X HEXDIGIT+ ) | (P0X '-' HEXDIGIT+ ) | ( '-' HEXDIGIT+ H )
    ;
 
 COMMENT

bcomp-assembler/src/main/java/ru/ifmo/cs/bcomp/assembler/AsmNg.java

@@ -18,6 +18,7 @@
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.List;
 
 /**
  *
@@ -29,6 +30,7 @@ public class AsmNg {
      * from base_address
      */
     public static final int BASE_ADDRESS = 0x10;
+    private List<String> errors;
 
     public static void main(String[] args) throws Exception {
         AsmNg asmng = new AsmNg(
@@ -74,6 +76,10 @@ public BCompNGParser getParser() {
         return parser;
     }
 
+    public List<String> getErrors() {
+        return errors;
+    }
+
     public Program compile () {
         //decode commands and collect all labels
         //System.out.println("first pass");

bcomp-assembler/src/main/java/ru/ifmo/cs/bcomp/assembler/AssemblerAntlrErrorStrategy.java

@@ -0,0 +1,63 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package ru.ifmo.cs.bcomp.assembler;
+
+import org.antlr.v4.runtime.DefaultErrorStrategy;
+import org.antlr.v4.runtime.Parser;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.misc.IntervalSet;
+
+/**
+ *
+ * @author serge
+ */
+public class AssemblerAntlrErrorStrategy extends DefaultErrorStrategy {
+
+    @Override
+    public void reportError(Parser recognizer, RecognitionException e) {
+        //System.err.println(e.getMessage());
+        if (!(e instanceof AssemblerException)) {
+            super.reportError(recognizer, e);
+            return;
+        }
+        AssemblerException ae = (AssemblerException)e;
+        // if we've already reported an error and have not matched a token
+        // yet successfully, don't report any errors.
+        //if (inErrorRecoveryMode(recognizer)) {
+        //System.err.print("[SPURIOUS] ");
+        //    return; // don't report spurious errors
+        //}
+        beginErrorCondition(recognizer);
+        recognizer.notifyErrorListeners(ae.getOffendingToken(),ae.getMessage(), ae);
+    }
+
+    @Override
+    public void recover(Parser recognizer, RecognitionException e) {
+//		System.out.println("recover in "+recognizer.getRuleInvocationStack()+
+//						   " index="+recognizer.getInputStream().index()+
+//						   ", lastErrorIndex="+
+//						   lastErrorIndex+
+//						   ", states="+lastErrorStates);
+        if ( lastErrorIndex==recognizer.getInputStream().index() &&
+                lastErrorStates != null &&
+                lastErrorStates.contains(recognizer.getState()) ) {
+            // uh oh, another error at same token index and previously-visited
+            // state in ATN; must be a case where LT(1) is in the recovery
+            // token set so nothing got consumed. Consume a single token
+            // at least to prevent an infinite loop; this is a failsafe.
+//			System.err.println("seen error condition before index="+
+//							   lastErrorIndex+", states="+lastErrorStates);
+//			System.err.println("FAILSAFE consumes "+recognizer.getTokenNames()[recognizer.getInputStream().LA(1)]);
+            recognizer.consume();
+        }
+        lastErrorIndex = recognizer.getInputStream().index();
+        if ( lastErrorStates==null ) lastErrorStates = new IntervalSet();
+        lastErrorStates.add(recognizer.getState());
+        IntervalSet followSet = getErrorRecoverySet(recognizer);
+        consumeUntil(recognizer, followSet);
+    }
+
+}

bcomp-assembler/src/main/java/ru/ifmo/cs/bcomp/assembler/AssemblerException.java

@@ -0,0 +1,42 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package ru.ifmo.cs.bcomp.assembler;
+
+import org.antlr.v4.runtime.Parser;
+import org.antlr.v4.runtime.ParserRuleContext;
+import org.antlr.v4.runtime.RecognitionException;
+
+/**
+ *
+ * @author serge
+ */
+public class AssemblerException extends RecognitionException {
+
+
+    public AssemblerException(Parser recognizer) { // LL(1) error
+        super(recognizer, recognizer.getInputStream(), recognizer.getContext());
+        this.setOffendingToken(recognizer.getCurrentToken());
+    }
+
+
+    public AssemblerException(String msg, Parser recognizer, ParserRuleContext ctx) {
+        super(msg, recognizer, recognizer.getInputStream(), ctx);
+        //System.out.println(msg+recognizer.getCurrentToken());
+        this.setOffendingToken(recognizer.getCurrentToken());
+    }
+
+    public AssemblerException(String msg, Parser recognizer) {
+        super(msg, recognizer, recognizer.getInputStream(), recognizer.getContext());
+        this.setOffendingToken(recognizer.getCurrentToken());
+    }
+
+    public ParserRuleContext getParserRuleContext() {
+        return (ParserRuleContext)getCtx();
+    }
+
+
+
+}

bcomp-assembler/src/main/java/ru/ifmo/cs/bcomp/assembler/Instruction.java

@@ -10,7 +10,7 @@
  * @author Dmitry Afanasiev <[email protected]>
  */
 public enum Instruction {
-        
+
     //address
     AND(0x2000,ADDR), OR(0x3000 ,ADDR), ADD(0x4000,ADDR), ADC(0x5000,ADDR),
     SUB(0x6000,ADDR), CMP(0x7000,ADDR), LOOP(0x8000,ADDR), LD(0xA000,ADDR),
@@ -28,6 +28,8 @@ public enum Instruction {
     BEQ(0xF000,BRANCH), BNE(0xF100,BRANCH), BMI(0xF200,BRANCH), BPL(0xF300,BRANCH),
     BCS(0xF400,BRANCH), BCC(0xF500,BRANCH), BVS(0xF600,BRANCH), BVC(0xF700,BRANCH),
     BLT(0xF800,BRANCH), BGE(0xF900,BRANCH), BR(0xCE00, BRANCH),
+    //io
+    DI(0x1000,NONADDR),EI(0x1100,NONADDR),IN(0x1200,IO),OUT(0x1300,IO),INT(0x1800,IO),
 
     END(1,Type.NONADDR);
 
@@ -40,15 +42,15 @@ public enum Instruction {
     }
 
     public enum Type {
-            ADDR, NONADDR, BRANCH, IO
+        ADDR, NONADDR, BRANCH, IO
     };
 
     public final int opcode;
     public final String mnemonic;
     public Type type;
 
     public String getTypeString() {
-       return type.name();
+        return type.name();
     }
-        
-}
+
+}

bcomp-assembler/src/main/java/ru/ifmo/cs/bcomp/assembler/InstructionWord.java

@@ -10,18 +10,19 @@
  * @author serge
  */
 public class InstructionWord extends MemoryWord {
-    public volatile Instruction instruction;
-    public volatile AddressingMode operand = null;
-    
+    public volatile Instruction instruction = null;
+    public volatile AddressingMode operand = null; //only for address command
+    public volatile Integer device = UNDEFINED; //only for io command IN OUT INTR
+
     @Override
     public String toString() {
         return  Integer.toHexString(address+0x100000).substring(3) + "| " +
                 (label != null ? label.name + ": " : "" ) +
                 instruction.mnemonic + " " +
                 (instruction.type == Instruction.Type.ADDR? operand.toString(): "") +
                 (instruction.type == Instruction.Type.BRANCH? " label="+operand.reference: "") +
-                " \t; type=" + instruction.type + 
+                " \t; type=" + instruction.type +
                 (value != UNDEFINED? " value=0x"+Integer.toHexString(value): "");
-    }   
-    
-}
+    }
+
+}