6502/8bitworkshop
1
0
Fork 0
mirror of https://github.com/sehugg/8bitworkshop.git synced 2024-06-03 04:29:33 +00:00
Code Issues Projects Releases Wiki Activity

fixing disasm cursor jumping

Browse Source
This commit is contained in:
Steven Hugg 2019-09-16 19:04:14 -05:00
parent f31e2568f6
commit 3faae474ee
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/notes.txt
View File

@ -183,7 +183,8 @@ TODO:
- compiler bug in chase - compiler bug in chase
- "shared" in URL doesn't work, leave in URL? (also importURL) - "shared" in URL doesn't work, leave in URL? (also importURL)
- segments disappear in memory map when binary unchanged - segments disappear in memory map when binary unchanged
- 6502
- KIL stops debugger
- TypeError: null is not an object (evaluating 'n.destination') - TypeError: null is not an object (evaluating 'n.destination')
https://8bitworkshop.com/v3.4.1/javatari.js/release/javatari/javatari.js https://8bitworkshop.com/v3.4.1/javatari.js/release/javatari/javatari.js
(32:443651) Safari 12.1.2 (32:443651) Safari 12.1.2

15
src/views.ts
View File

@ -461,10 +461,10 @@ export class DisassemblerView implements ProjectView {
} }
var text = disassemble(pc-disasmWindow, pc) + disassemble(pc, pc+disasmWindow); var text = disassemble(pc-disasmWindow, pc) + disassemble(pc, pc+disasmWindow);
this.disasmview.setValue(text); this.disasmview.setValue(text);
if (moveCursor) { if (moveCursor) {
this.disasmview.setCursor(selline, 0); this.disasmview.setCursor(selline, 0);
jumpToLine(this.disasmview, selline);
} }
jumpToLine(this.disasmview, selline);
} }
getCursorPC() : number { getCursorPC() : number {
@ -511,14 +511,13 @@ export class ListingView extends DisassemblerView implements ProjectView {
var asmtext = this.assemblyfile.text; var asmtext = this.assemblyfile.text;
var disasmview = this.getDisasmView(); var disasmview = this.getDisasmView();
disasmview.setValue(asmtext); disasmview.setValue(asmtext);
var debugging = true; // TODO: platform.isDebugging && platform.isDebugging(); if (pc >= 0 && this.assemblyfile) {
var findPC = debugging ? pc : -1; var lineno = this.assemblyfile.findLineForOffset(pc, 15);
if (findPC >= 0 && this.assemblyfile) { if (lineno) {
var lineno = this.assemblyfile.findLineForOffset(findPC, 15);
if (lineno && moveCursor) {
// set cursor while debugging // set cursor while debugging
if (debugging) if (moveCursor) {
disasmview.setCursor(lineno-1, 0); disasmview.setCursor(lineno-1, 0);
}
jumpToLine(disasmview, lineno-1); jumpToLine(disasmview, lineno-1);
} }
} }