patch: load bytecode instead of assembly

microsoft · Dec 2, 2022 · 2945f77 · 2945f77
1 parent eea64a6
commit 2945f77
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/cli/src/build.ts b/cli/src/build.ts
@@ -11,7 +11,7 @@ import {
     compile,
     jacdacDefaultSpecifications,
     JacsDiagnostic,
-    DEVS_ASSEMBLY_FILE,
+    DEVS_BYTECODE_FILE,
 } from "devicescript-compiler"
 import { CmdOptions } from "./command"
 import { startDevTools } from "./devtools"
@@ -95,7 +95,7 @@ export async function build(file: string, options: BuildOptions) {
 }
 
 async function buildWatch(file: string, options: BuildOptions) {
-    const bytecodeFile = join(options.outDir, DEVS_ASSEMBLY_FILE)
+    const bytecodeFile = join(options.outDir, DEVS_BYTECODE_FILE)
 
     // start watch source file
     console.log(`watching ${file}...`)

diff --git a/cli/src/devtools.ts b/cli/src/devtools.ts
@@ -10,6 +10,7 @@ import fs from "fs"
 const log = console.log
 const debug = console.debug
 const error = console.error
+const dasboardPath = "editors/devicescript"
 
 function fetchProxy(localhost: boolean): Promise<string> {
     const protocol = localhost ? http : https
@@ -31,8 +32,8 @@ function fetchProxy(localhost: boolean): Promise<string> {
                     body = body.replace(
                         /https:\/\/microsoft.github.io\/jacdac-docs\/dashboard/g,
                         localhost
-                            ? "http://localhost:8000/devicescript/"
-                            : "https://microsoft.github.io/jacdac-docs/editors/devicescript/"
+                            ? `http://localhost:8000/${dasboardPath}/`
+                            : `https://microsoft.github.io/jacdac-docs/${dasboardPath}/`
                     )
                     resolve(body)
                 })
@@ -54,8 +55,7 @@ export async function startDevTools(
     const tcpPort = 8082
     const listenHost = internet ? undefined : "127.0.0.1"
 
-    log(`start dev tools for ${bytecodeFile}`)
-    log(`   dashboard: http://localhost:${port}`)
+    log(`starting dev tools at http://localhost:${port}`)
     log(`   websocket: ws://localhost:${port}`)
     log(`   tcpsocket: tcp://localhost:${tcpPort}`)
 

diff --git a/compiler/src/compiler.ts b/compiler/src/compiler.ts
@@ -73,6 +73,7 @@ export const CMD_GET_REG = 0x1000
 export const CMD_SET_REG = 0x2000
 
 export const DEVS_ASSEMBLY_FILE = "prog.jasm"
+export const DEVS_BYTECODE_FILE = "prog.jacs"
 
 class Cell {
     _index: number
@@ -2803,7 +2804,7 @@ class Program implements TopOpWriter {
             globals: this.globals.list.map(r => r.debugInfo()),
             source: this._source,
         }
-        this.host.write("prog.jacs", b)
+        this.host.write(DEVS_BYTECODE_FILE, b)
         const progJson = {
             text: this._source,
             blocks: "",