From 1fa51ae5d4031e2dda52ba45ee3a115474cb4d1d Mon Sep 17 00:00:00 2001 From: Steven Hugg Date: Mon, 16 Jan 2017 10:35:19 -0500 Subject: [PATCH] new buttons; better DASM listing; fixed dbg btns; removed menu --- css/codemirror.css | 8 ++- images/pause.png | Bin 95 -> 0 bytes images/play.png | Bin 123 -> 0 bytes images/resetandrun.png | Bin 143 -> 0 bytes images/runtoline.png | Bin 128 -> 0 bytes images/share.png | Bin 193 -> 0 bytes images/singlestep.png | Bin 160 -> 0 bytes images/timing.png | Bin 165 -> 0 bytes index.html | 20 +++---- package.json | 2 +- src/emu.js | 2 + src/platform/spaceinv.js | 19 ++----- src/platform/vcs.js | 2 - src/ui.js | 72 +++++++++++++------------- src/worker/workermain.js | 23 ++++---- test/cli/{worker.js => testworker.js} | 25 +++++++-- 16 files changed, 92 insertions(+), 81 deletions(-) delete mode 100644 images/pause.png delete mode 100644 images/play.png delete mode 100644 images/resetandrun.png delete mode 100644 images/runtoline.png delete mode 100644 images/share.png delete mode 100644 images/singlestep.png delete mode 100644 images/timing.png rename test/cli/{worker.js => testworker.js} (81%) diff --git a/css/codemirror.css b/css/codemirror.css index f49af69d..551a3c6a 100644 --- a/css/codemirror.css +++ b/css/codemirror.css @@ -366,7 +366,7 @@ span.CodeMirror-selectedtext { background: none; } .cm-s-mbo span.cm-comment { color: #95958a; } .cm-s-mbo span.cm-atom { color: #00a8c6; } -.cm-s-mbo span.cm-number { color: #00a8c6; } +.cm-s-mbo span.cm-number { color: #33aadd; } .cm-s-mbo span.cm-property, .cm-s-mbo span.cm-attribute { color: #9ddfe9; } .cm-s-mbo span.cm-keyword { color: #ffb928; } @@ -376,7 +376,7 @@ span.CodeMirror-selectedtext { background: none; } .cm-s-mbo span.cm-variable { color: #ffffec; } .cm-s-mbo span.cm-variable-2 { color: #00a8c6; } .cm-s-mbo span.cm-variable-3 { color: #ffb928; } -.cm-s-mbo span.cm-def { color: #ffff88; } +.cm-s-mbo span.cm-def { color: #88eeff; } .cm-s-mbo span.cm-bracket { color: #fffffc; font-weight: bold; } .cm-s-mbo span.cm-tag { color: #9ddfe9; } .cm-s-mbo span.cm-link { color: #f54b07; } @@ -414,3 +414,7 @@ span.CodeMirror-selectedtext { background: none; } .cm-s-cobalt .CodeMirror-activeline-background { background: #003399; } .cm-s-cobalt .CodeMirror-matchingbracket { outline:1px solid grey;color:white !important; } + +/*** FIXES FOR BOOTSTRAP ***/ + +.CodeMirror-dialog > button { background-color: #333 !important; } diff --git a/images/pause.png b/images/pause.png deleted file mode 100644 index a8f3750d07db25dbbc07baad2798b505c9292159..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`YMw5RAr`&K2@;wLO# qL;?h6Xp|mY!Fc#kL*Rh}3=AFWOhPZOrP%;=FnGH9xvX8 zOk`x?RXoP9r%fQ6!Oz*lkYTmr5-Ep`+!C6G49>=yYzB`fB`97`ONwm>|NMY~!EOb+ V8$i<-JYD@<);T3K0RXqgAdvt7 diff --git a/images/resetandrun.png b/images/resetandrun.png deleted file mode 100644 index 40aa6b41830d835ccc90f8bcaa1c9c60f5f04e69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`VV*9IAr`%R10DGo6gXD>`=7qs zw0%bQjvZ52yR6zeUcO_?XS3;H?wK>KKw}1j>%)4-H*3>4s~y`P%1p7zS$Oo|+V=;} rui29}){^!*Pw1L6X)z4*}Q$iB}t3Wgk diff --git a/images/runtoline.png b/images/runtoline.png deleted file mode 100644 index 2f7ce52da6c366dcab6f90112b78e58fa0532d5b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`?w&4=Ar`&K2@)9xJRJVnD{l3f zvMb>MufzB2^=nprcyUzB;E2Sbj)MvZ1>EMyDDfN&@GrDdV4EPcVF`0e`ov^m<)fUP bNem29Cpq}r|GZiOG?Ky7)z4*}Q$iB}Wx^@c diff --git a/images/share.png b/images/share.png deleted file mode 100644 index ba54c712651494fddd98c4ea1a25128720dac272..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPN53jI>RB-4ycA$`-r;B5V#p&dP1;#)6^$xhKRP4Fo z<2vbZrm@ewPMLJ&?#&N2Oq`ImDCUEF|8xmYUKh6*y;P;(&-F97XKMILh)5rBT5|d2 h7Fi*Ar`$$CwcN6FyLVJz4E{Q z=HAebqf1l$R9Lzt8dRSpb;X?i$UaG7ao;nkJs-PPt`^qkIwQL5+rBD?iPDExO}1BJ zNR#up##GmH%4N~aBPkOjj`aVyEuQkx<$%+iXZEowNjq(H&4r)I^34Ci(G9ec!PC{x JWt~$(69BM5JG=k@ diff --git a/images/timing.png b/images/timing.png deleted file mode 100644 index f15888f6708cda9f65b2c58d39399b577c7c7aaa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ii4<#Ar`$$gFJ-}C~!3U{r~^; z%OxwX!^?JB=y3A5JrVFKdhsDIjJ1aMYU#7k8Dftj8tyu%>}%fT==kKiJZHqjHQTqI zbSQJ#6Cd@FO*OgBTKd4Oleb%New File...
  • Share File...
  • Revert to Original...
    • +
  • Debug
      @@ -206,15 +208,15 @@ canvas.pixelated { - - - - - - - - - + + + + + + + + + diff --git a/package.json b/package.json index 820eee5e..49be922b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "8bitworkshop", - "version": "0.0.1", + "version": "0.0.2", "author": "Steven Hugg", "dependencies": {}, "devDependencies": { diff --git a/src/emu.js b/src/emu.js index fefd6e79..3a790b89 100644 --- a/src/emu.js +++ b/src/emu.js @@ -630,6 +630,8 @@ var BaseZ80Platform = function() { if (fn.endsWith(".s")) return "sdasz80"; return "z80asm"; } + // TODO + //this.getOpcodeMetadata = function() { } } function padBytes(data, len) { diff --git a/src/platform/spaceinv.js b/src/platform/spaceinv.js index 546d9d5a..efe7f4d2 100644 --- a/src/platform/spaceinv.js +++ b/src/platform/spaceinv.js @@ -15,7 +15,7 @@ var SpaceInvadersPlatform = function(mainElement) { this.__proto__ = new BaseZ80Platform(); var cpu, ram, membus, iobus, rom; - var video, audio, timer, pixels, displayPCs; + var video, timer, pixels, displayPCs; var inputs = [0xe,0x8,0x0]; var bitshift_offset = 0; var bitshift_register = 0; @@ -38,16 +38,6 @@ var SpaceInvadersPlatform = function(mainElement) { 50:{i:1,b:1}, // 2 } - this.getOpcodeMetadata = function() { - return { - opcode:0, - mnenomic:'?', - minCycles:0, - maxCycles:0, - insnlength:1 - }; - } - this.getPresets = function() { return SPACEINV_PRESETS; } @@ -58,10 +48,10 @@ var SpaceInvadersPlatform = function(mainElement) { membus = { read: function(address) { if (address < 0x2000) { - return rom ? rom[address] : 0; + return (rom ? rom[address] : 0) & 0xff; } else { address &= 0x1fff; - return ram.mem[address]; + return ram.mem[address] & 0xff; } }, write: function(address, value) { @@ -122,7 +112,6 @@ var SpaceInvadersPlatform = function(mainElement) { ioBus: iobus }); video = new RasterVideo(mainElement,256,224,{rotate:-90}); - audio = new SampleAudio(cpuFrequency); video.create(); $(video.canvas).click(function(e) { var x = Math.floor(e.offsetX * video.canvas.width / $(video.canvas).width()); @@ -215,11 +204,9 @@ var SpaceInvadersPlatform = function(mainElement) { } this.pause = function() { timer.stop(); - audio.stop(); } this.resume = function() { timer.start(); - audio.start(); } this.reset = function() { cpu.reset(); diff --git a/src/platform/vcs.js b/src/platform/vcs.js index 261fba9f..5b4e3397 100644 --- a/src/platform/vcs.js +++ b/src/platform/vcs.js @@ -42,8 +42,6 @@ var VCSPlatform = function() { this.getPresets = function() { return VCS_PRESETS; } this.start = function() { - $("#dbg_timing").show(); - $("#dbg_disasm").show(); Javatari.start(); } diff --git a/src/ui.js b/src/ui.js index 8abbc776..03ae0582 100644 --- a/src/ui.js +++ b/src/ui.js @@ -74,7 +74,7 @@ var SourceFile = function(lines, text) { } this.findLineForOffset = function(PC) { if (this.offset2line) { - for (var i=0; i<256; i++) { + for (var i=0; i<16; i++) { var line = this.offset2line[PC]; if (line >= 0) { return line; @@ -200,17 +200,9 @@ function gotoPresetAt(index) { } function gotoPresetNamed(id) { - if (id.startsWith("_")) { - var result = eval(id+"()"); - console.log(id, result); - if (!result) { - updateSelector(); - } - } else { - qs['platform'] = platform_id; - qs['file'] = id; - window.location = "?" + $.param(qs); - } + qs['platform'] = platform_id; + qs['file'] = id; + window.location = "?" + $.param(qs); } function _createNewFile(e) { @@ -263,7 +255,7 @@ function _resetPreset(e) { } function populateExamples(sel) { - sel.append($("