Skip to content

Commit ecf162b

Browse files
HackMemory0HackMemory0
committed
какие то правки
1 parent 957458d commit ecf162b

File tree

6 files changed

+38
-67
lines changed

6 files changed

+38
-67
lines changed

‎bcomp-assembler/src/main/antlr4/ru.ifmo.cs.bcomp.grammar/BCompNGBaseListener.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
package ru.ifmo.cs.bcomp.grammar;
66

7+
import org.antlr.v4.runtime.ParserRuleContext;
78
import org.antlr.v4.runtime.tree.ErrorNode;
89
import org.antlr.v4.runtime.tree.TerminalNode;
9-
import org.antlr.v4.runtime.ParserRuleContext;
1010

1111
public class BCompNGBaseListener implements BCompNGListener
1212
{

‎bcomp-assembler/src/main/antlr4/ru.ifmo.cs.bcomp.grammar/BCompNGBaseVisitor.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,11 @@
44

55
package ru.ifmo.cs.bcomp.grammar;
66

7-
import org.antlr.v4.runtime.tree.RuleNode;
87
import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
9-
10-
import ru.ifmo.cs.bcomp.grammar.BCompNGLexer;
8+
import ru.ifmo.cs.bcomp.grammar.BCompNGBaseListener.*;
119
import ru.ifmo.cs.bcomp.grammar.BCompNGLexer.*;
12-
import ru.ifmo.cs.bcomp.grammar.BCompNGListener;
1310
import ru.ifmo.cs.bcomp.grammar.BCompNGParser;
1411
import ru.ifmo.cs.bcomp.grammar.BCompNGParser.*;
15-
import ru.ifmo.cs.bcomp.grammar.BCompNGBaseListener;
16-
import ru.ifmo.cs.bcomp.grammar.BCompNGBaseListener.*;
1712

1813
public class BCompNGBaseVisitor<T> extends AbstractParseTreeVisitor<T> implements BCompNGVisitor<T>
1914
{

‎bcomp-assembler/src/main/antlr4/ru.ifmo.cs.bcomp.grammar/BCompNGLexer.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,12 @@
44

55
package ru.ifmo.cs.bcomp.grammar;
66

7+
import org.antlr.v4.runtime.*;
8+
import org.antlr.v4.runtime.atn.ATN;
79
import org.antlr.v4.runtime.atn.ATNDeserializer;
8-
import org.antlr.v4.runtime.VocabularyImpl;
9-
import org.antlr.v4.runtime.RuntimeMetaData;
1010
import org.antlr.v4.runtime.atn.LexerATNSimulator;
11-
import org.antlr.v4.runtime.CharStream;
12-
import org.antlr.v4.runtime.atn.ATN;
13-
import org.antlr.v4.runtime.Vocabulary;
1411
import org.antlr.v4.runtime.atn.PredictionContextCache;
1512
import org.antlr.v4.runtime.dfa.DFA;
16-
import org.antlr.v4.runtime.Lexer;
1713

1814
public class BCompNGLexer extends Lexer
1915
{

‎bcomp-assembler/src/main/antlr4/ru.ifmo.cs.bcomp.grammar/BCompNGParser.java‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,17 @@
44

55
package ru.ifmo.cs.bcomp.grammar;
66

7-
import org.antlr.v4.runtime.Recognizer;
8-
import org.antlr.v4.runtime.tree.RuleNode;
9-
import org.antlr.v4.runtime.tree.ParseTreeVisitor;
10-
import org.antlr.v4.runtime.tree.ParseTreeListener;
11-
import org.antlr.v4.runtime.tree.TerminalNode;
12-
import java.util.List;
7+
import org.antlr.v4.runtime.*;
8+
import org.antlr.v4.runtime.atn.ATN;
139
import org.antlr.v4.runtime.atn.ATNDeserializer;
14-
import org.antlr.v4.runtime.VocabularyImpl;
15-
import org.antlr.v4.runtime.RuntimeMetaData;
16-
import org.antlr.v4.runtime.NoViableAltException;
17-
import org.antlr.v4.runtime.RecognitionException;
18-
import org.antlr.v4.runtime.ParserRuleContext;
1910
import org.antlr.v4.runtime.atn.ParserATNSimulator;
20-
import org.antlr.v4.runtime.TokenStream;
21-
import org.antlr.v4.runtime.atn.ATN;
22-
import org.antlr.v4.runtime.Vocabulary;
2311
import org.antlr.v4.runtime.atn.PredictionContextCache;
2412
import org.antlr.v4.runtime.dfa.DFA;
25-
import org.antlr.v4.runtime.Parser;
13+
import org.antlr.v4.runtime.tree.ParseTreeListener;
14+
import org.antlr.v4.runtime.tree.ParseTreeVisitor;
15+
import org.antlr.v4.runtime.tree.TerminalNode;
16+
17+
import java.util.List;
2618

2719
public class BCompNGParser extends Parser
2820
{

‎bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/components/ComponentManager.java‎

Lines changed: 1 addition & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -268,30 +268,6 @@ public ComponentManager(GUI gui) {
268268
input =new InputRegisterView(this,cpu.getRegister(Reg.IR));
269269
ioctrls = gui.getIOCtrls();
270270

271-
/*cpu.setCPUStartListener(new Runnable() {
272-
@Override
273-
public void run() {
274-
if (!printOnStop)
275-
return;
276-
writelist.clear();
277-
savedPointer = cpu.getRegValue(cpu.getClockState() ? Reg.IP : Reg.MP);
278-
TraceView.setTrace(TraceView.printRegsTitle());
279-
}
280-
});
281-
282-
cpu.setCPUStopListener(new Runnable() { // Print changed mem
283-
@Override
284-
public void run() {
285-
if (!printOnStop)
286-
return;
287-
288-
//printRegs(writelist.isEmpty() ? "" : " " + getMemory(writelist.remove(0)));
289-
290-
//for (Long wraddr : writelist)
291-
//println(String.format("%1$34s", " ") + getMemory(wraddr));
292-
}
293-
});*/
294-
295271
setTickStartListenerval = new Runnable() {
296272
@Override
297273
public void run() {
@@ -514,7 +490,7 @@ public void cmdLoadProgramm() throws IOException {
514490
File file = jfc.getSelectedFile();
515491
for(String line : Files.readAllLines(file.toPath()) ){
516492

517-
line.trim();
493+
line = line.trim();
518494
if (line.substring(line.length() - 1).equals("a")){
519495
String addr = line.replaceFirst(".$","");
520496

‎bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/components/TraceView.java‎

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import static ru.ifmo.cs.bcomp.ui.components.DisplayStyles.*;
2525

26+
//боже, не смотри сюда, тут какой-то трэш
2627

2728
public class TraceView extends BCompPanel {
2829

@@ -144,7 +145,7 @@ public void actionPerformed(ActionEvent e) {
144145
public void setValue(long value) {
145146
long addr = cpu.getRegValue(Reg.AR);
146147

147-
if (!writelist.contains(addr)) // Saving changed mem addr to print later
148+
if (!writelist.contains(addr))
148149
writelist.add(addr);
149150
}
150151
});
@@ -161,7 +162,7 @@ public void run() {
161162
}
162163
});
163164

164-
cpu.setCPUStopListener(new Runnable() { // Print changed mem
165+
cpu.setCPUStopListener(new Runnable() {
165166
@Override
166167
public void run() {
167168
if (!printOnStop)
@@ -174,7 +175,6 @@ public void run() {
174175
for (Long wraddr : writelist) {
175176
setTrace(String.format(",%1$34s", "\t") + getMemory(wraddr) + "\n");
176177
stringRegsCsv.append(String.format(",%1$34s", ",") + getMemoryCsv(wraddr) + "\n");
177-
//stringBuilderRegsCsv.append(String.format(",%1$34s", ",") + getMemoryCsv(wraddr) + "\n");
178178
}
179179
}
180180
});
@@ -196,6 +196,7 @@ public void run() {
196196
cpu.startContinue();
197197

198198
cpu.executeContinue();
199+
//какой то говнокод, зато работает
199200
while ( !Long.toHexString(cpu.getRegValue(Reg.CR)).equals("100") ) {
200201
System.out.println(Long.toHexString( cpu.getRegValue(Reg.CR)));
201202
cpu.executeContinue();
@@ -260,16 +261,18 @@ public void actionPerformed(ActionEvent e) {
260261

261262

262263

263-
}
264-
265-
@Override
266-
public void stepStart(){
267-
268-
}
269-
270-
@Override
271-
public void stepFinish(){
264+
JButton btn3 = new JButton("Нажми на меня...");
265+
btn3.setForeground(COLOR_TEXT);
266+
btn3.setBackground(COLOR_VALUE);
267+
btn3.setFont(FONT_COURIER_PLAIN_12);
268+
btn3.addActionListener(new ActionListener() {
269+
@Override
270+
public void actionPerformed(ActionEvent e) {
271+
JOptionPane.showMessageDialog(null, "1) Всегда указывайте адрес начала программы\n2) В программе обязательно должен быть HLT, чтобы БЭВМ тупа не завис (мне лень просто делать какие-то проверки)\n3) Вроде все :D");
272+
}
273+
});
272274

275+
bottomButtons.add(btn3);
273276
}
274277

275278
public static void setTrace(String str){
@@ -281,8 +284,6 @@ public static void setTrace(String str){
281284
text.setCaretPosition(len);
282285
text.setCharacterAttributes(aset, false);
283286
text.replaceSelection(str);
284-
//Document doc = text.getDocument();
285-
//doc.insertString(doc.getLength(), str, null);
286287
} catch (Exception e) {
287288
e.printStackTrace();
288289
}
@@ -295,6 +296,17 @@ public String getPanelName() {
295296

296297
@Override
297298
public void redrawArrows() {
299+
}
300+
301+
@Override
302+
public void panelActivate(){
303+
}
298304

305+
@Override
306+
public void stepStart(){
307+
}
308+
309+
@Override
310+
public void stepFinish() {
299311
}
300312
}

0 commit comments

Comments
 (0)