forked from MARIE-js/MARIE.js
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
e3be2b8
commit 8342705
Showing
37 changed files
with
14,530 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| mariejs.xyz |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
|
|
||
| <!DOCTYPE html> | ||
| <html> | ||
| <head> | ||
| <meta charset="utf-8"> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"> | ||
| <title>MARIE.js | About</title> | ||
|
|
||
| <script src="js/marie.min.js" type="text/javascript"></script> | ||
|
|
||
| <script src="https://apis.google.com/js/client.js?onload=checkAuth"></script> | ||
|
|
||
| <link href="css/bootstrap.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/bootstrap-tour.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/bootstrap-tour.min.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/bootstrap-popover-x.css" media="all" rel="stylesheet" type="text/css" /> | ||
| <link href="css/show-hint.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/sdialog.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/plain.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/font-awesome.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/nprogress.css" rel="stylesheet" type="text/css"> | ||
|
|
||
| <link href="css/codemirror.css" rel="stylesheet" type="text/css"> | ||
| <link href="css/codemirrorDracula.css" rel="stylesheet" type="text/css"> | ||
| <link id="mode" href="css/styleLight.css" rel="stylesheet" type="text/css"> | ||
| <link rel="icon" type="image/x-icon" href="favicon.ico" /> | ||
| </head> | ||
|
|
||
| <body> | ||
| <header> | ||
| <!-- Static navbar --> | ||
| <nav id="top-menu" class="navbar navbar-fixed-top"> | ||
| <div class="container-fluid"> | ||
| <div class="navbar-header"> | ||
| <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar"> | ||
| <span class="sr-only">Toggle navigation</span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| <span class="icon-bar"></span> | ||
| </button> | ||
| <a class="navbar-brand"> | ||
| <img src="images/logo.png" style="height:100%" alt="logo"> | ||
| </a> | ||
| </div> | ||
| <div id="navbar" class="navbar-collapse collapse"> | ||
| <ul class="nav navbar-nav"> | ||
| <li><a href="./"><span class="fa fa-home"></span> Home </a></li> | ||
|
|
||
| <li class="dropdown" id="help"> | ||
| <a class="dropdown-toggle" data-toggle="dropdown"><span class="fa fa-question-circle-o"></span> Help | ||
| <span class="caret"></span></a> | ||
| <ul class="dropdown-menu"> | ||
| <li><a href="about.html"><span class="fa fa-info-circle"></span> About </a></li> | ||
| <li><a id="displayVersion"><span class="fa fa-hashtag"></span> Current Version</a></li> | ||
| <li><a href="https://github.com/MARIE-js/MARIE.js/releases" target="_blank"><span class="fa fa-github-alt"></span> Releases</a></li> | ||
|
|
||
| <li class="divider"></li> | ||
| <li><a href="https://github.com/MARIE-js/MARIE.js/wiki/Frequently-Asked-Questions-(FAQs)" target="_blank"><span class="fa fa-question"></span> FAQs </a></li> | ||
| <li><a href="https://github.com/MARIE-js/MARIE.js/wiki" target="_blank"><span class="fa fa-book"></span> Wiki </a></li> | ||
| <li><a href="book.pdf" target="_blank"><span class="fa fa-book"></span> Get eBook </a></li> | ||
| <li><a href="https://github.com/MARIE-js/MARIE.js/wiki/MARIE-Instruction-Set-(with-Opcodes)" target="_blank"><span class="fa fa-info"></span> Instruction Set </a></li> | ||
| <li class="divider"></li> | ||
| <li><a href="https://gitreports.com/issue/MARIE-js/MARIE.js/" target="_blank"><span class="fa fa-bug"></span> Report an Issue</a></li> | ||
| <li><a href="https://goo.gl/CWAaES" target="_blank"><span class="fa fa-paperclip"></span> Submit Feedback</a></li> | ||
| </ul> | ||
| </li> | ||
| </ul> | ||
| <ul class="nav navbar-nav navbar-right"> | ||
| <li><a href="https://github.com/MARIE-js/MARIE.js" target="_blank"><span class="fa fa-github"></span></a></li> | ||
| </ul> | ||
| </div><!--/.nav-collapse --> | ||
| </div><!--/.container-fluid --> | ||
| </nav> | ||
| </header> | ||
|
|
||
| <main> | ||
| <div id="about" class="container"> | ||
| <h1 class="center">MARIE.js <span class="version">v1.0.0-preivew</span></h1> | ||
| <h2>About MARIE</h2> | ||
| <p>MARIE ('Machine Architecture that is Really Intuitive and Easy') is a machine architecture and assembly language from <a href="https://books.google.com.au/books/about/The_Essentials_of_Computer_Organization.html?id=3kQoAwAAQBAJ&redir_esc=y" target="_blank">The Essentials of Computer Organization and Architecture</a> (Linda Null, Julia Lobur). The publisher provides a set of <a href="http://computerscience.jbpub.com/ecoa/3e/simulators.aspx">simulators for the machine</a>, written in Java. However, since using simulators can be rather difficult, we have implemented a web-based version, so that students are able to access it readily and easily. Since beginning the project we have added many features such as importing and exporting of Marie Assembly Source files (*.mas) to provide compatibility with the existing simulators.</p> | ||
| <br> | ||
| <hr> | ||
| <h2>Terms of Use</h2> | ||
| By agreeing to the following terms and conditions, you understand that: | ||
| <ul> | ||
| <li> you are bound by the Higher Education Plagiarism Notice set here: <a href="https://github.com/MARIE-js/MARIE.js/wiki#plagiarism-notice-for-higher-education-students" target="_blank">https://github.com/MARIE-js/MARIE.js/wiki#plagiarism-notice-for-higher-education-students</a></li> | ||
| <li>all source code is bound by the MIT license, as specified in the README.md file: <a href="https://github.com/MARIE-js/MARIE.js#license" target="_blank">https://github.com/MARIE-js/MARIE.js#license</a></li> | ||
| <li>the Terms of Use may change in the future</li> | ||
| </ul> | ||
| <hr> | ||
| <h2>About MARIE.js</h2> | ||
| <p>MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy' in JavaScript.</p> | ||
| <p>It is currently developed by <a href="https://github.com/cyderize">Jason Nguyen</a>, <a href="https://github.com/jos0003">Saurabh Joshi</a>, <a href="https://github.com/lorderikir">Eric Jiang</a> and <a href="https://github.com/atrotors">Erfan Norozi</a>.</p> | ||
| <p>Some example/demostration code is writtern by <a href="https://github.com/RavenKelder">Felix Salim</a></p> | ||
| <hr> | ||
| <h2>License</h2> | ||
| <p>Copyright (c) 2016 Jason Nguyen, Saurabh Joshi, Eric Jiang, Erfan Norozi</p> | ||
| <p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p> | ||
|
|
||
| <p>The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p> | ||
|
|
||
| <p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p> | ||
|
|
||
| <hr> | ||
| <p> | ||
| <em>This project is designed by students of:</em><br> | ||
| <em>Monash University - Faculty of Information Technology</em> | ||
| <em>Designed for <strong>FIT1047</strong>: Introduction to Computers, Networks and Security.</em> | ||
| </p> | ||
| </div> | ||
| <!-- Version Modal --> | ||
| <div class="modal fade " id="currentVersion" role="dialog" data-keyboard="true" tabindex="-1"> | ||
| <div class="modal-dialog"> | ||
| <!-- Modal content--> | ||
| <div class="modal-content"> | ||
| <div class="modal-header"> | ||
| <h4 class="modal-title">MARIE.js | Current Version</h4> | ||
| </div> | ||
| <div class="modal-body"> | ||
| <p>This version is: v1.0.0-Beta</p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </main> | ||
|
|
||
| <footer> | ||
| <div class="container" style="padding: 0 0"> | ||
| </div> | ||
| <p>Created by <a href="https://github.com/cyderize">Jason Nguyen</a>, <a href="https://github.com/jos0003">Saurabh Joshi</a> and <a href="https://github.com/lorderikir">Eric Jiang</a>.</p> | ||
| </footer> | ||
| </body> | ||
| </html> | ||
|
|
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| / Addition Calculator | ||
| / by the MARIE.js Team | ||
| / Copyright (C) 2016. Licensed under the MIT License | ||
|
|
||
| Input | ||
| Store X | ||
| Input | ||
| Store Y | ||
|
|
||
| Add X | ||
| Output | ||
| Halt | ||
|
|
||
| X, DEC 0 | ||
| Y, DEC 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| / Multiplication Calculator | ||
| / by the MARIE.js Team | ||
| / Copyright (C) 2016. Licensed under the MIT License | ||
|
|
||
| / Prompt user to type in integers | ||
| INPUT | ||
| Store X | ||
| INPUT | ||
| Store Y | ||
|
|
||
| / Loop for performing iterative addition | ||
| loop, Load num | ||
| Add X | ||
| Store num | ||
|
|
||
| Load Y | ||
| Subt one | ||
| Store Y | ||
|
|
||
| Skipcond 400 / have we completed the multiplication? | ||
| Jump loop / no; repeat loop | ||
| / yes, so exit the loop | ||
|
|
||
| / Output result to user then halt program | ||
| Load num | ||
| Output | ||
| Halt | ||
|
|
||
| X, DEC 0 | ||
| Y, DEC 0 | ||
| num, DEC 0 | ||
| one, DEC 1 |
Oops, something went wrong.