Skip to content

Commit

Permalink
Merge branch 'master' of github.com:ibudiselic/FRISCjs
Browse files Browse the repository at this point in the history
  • Loading branch information
ibudiselic committed Jan 21, 2015
2 parents 5bfff47 + 13041f3 commit dc59dd7
Show file tree
Hide file tree
Showing 7 changed files with 232 additions and 242 deletions.
2 changes: 1 addition & 1 deletion README.markdown
Expand Up @@ -41,7 +41,7 @@ To use the Web-based simulator, launch the `webapp/index.html` page in a browser

To use the console-based simulator application, clone the FRISCjs repo:

> git clone https://github.com/izuzak/noam.git
> git clone https://github.com/izuzak/FRISCjs.git

and then run the app with node to see the instructions:

Expand Down
2 changes: 1 addition & 1 deletion consoleapp/frisc-console.js
Expand Up @@ -240,5 +240,5 @@ function runProgram(frisc_asmsource) {
return;
}

simulator.CPU.run();
simulator.CPU.run(true); // run in "fastests" mode
}
218 changes: 108 additions & 110 deletions lib/friscjs-browser.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit dc59dd7

Please sign in to comment.