Started working on better breakpoints

Correct bytecode line numbers reported when breakpoints are reached
Breakpoints behave better now
2015-05-03 16:37:15 -04:00 · 2015-04-22 21:02:36 -04:00 · 2015-04-22 20:26:29 -04:00 · 2015-04-22 20:07:31 -04:00 · 2015-04-22 00:04:46 -04:00 · 2015-04-21 17:37:06 -04:00
59 changed files with 1102 additions and 221 deletions
--- a/Thumbs.db
+++ b/Thumbs.db
--- a/app.js
+++ b/app.js
@@ -11,7 +11,7 @@ app.configure(function() {
  app.set('view engine', 'jade');
  app.use(express.logger('dev'));
  app.use(express.json());
-  
+
  app.use(express.static(path.join(__dirname, 'public')));

  //debug error handler
--- a/instructions/Thumbs.db
+++ b/instructions/Thumbs.db
--- a/logo.png
+++ b/logo.png
--- a/progress_report/gannt.jpg
+++ b/progress_report/gannt.jpg
--- a/progress_report/lit_review.fdb_latexmk
+++ b/progress_report/lit_review.fdb_latexmk
@@ -0,0 +1,10 @@
+# Fdb version 3
+["latex"] 1429036983 "lit_review.tex" "lit_review.dvi" "lit_review" 1429036987
+  "/usr/local/texlive/2014/texmf-dist/web2c/texmf.cnf" 1398200874 31722 4f52421e59a4b9e910cf18e64c1f2b4a ""
+  "/usr/local/texlive/2014/texmf-var/web2c/pdftex/latex.fmt" 1401025988 3831950 412798929e0196806f9f91e131a01806 ""
+  "/usr/local/texlive/2014/texmf.cnf" 1401025936 577 a59edbde8d3a8c549d0eeaab1739e2ff ""
+  "lit_review.aux" 1429036983 8 a94a2480d3289e625eea47cd1b285758 ""
+  "lit_review.tex" 1429035932 1602 8c64955909e149f1edf1ceb643d93c17 ""
+  (generated)
+  "lit_review.dvi"
+  "lit_review.log"
--- a/progress_report/lit_review.fls
+++ b/progress_report/lit_review.fls
@@ -0,0 +1,6 @@
+PWD /Users/shyam/Dropbox/cdb/progress_report
+INPUT /usr/local/texlive/2014/texmf.cnf
+INPUT /usr/local/texlive/2014/texmf-dist/web2c/texmf.cnf
+INPUT /usr/local/texlive/2014/texmf-var/web2c/pdftex/latex.fmt
+INPUT lit_review.tex
+OUTPUT lit_review.log
--- a/progress_report/lit_review.tex
+++ b/progress_report/lit_review.tex
@@ -0,0 +1,28 @@
+\section{Literature Review}
+Since the start of our project, we have found multiple new information sources;
+the following are the most important ones.
+\begin{itemize}
+\item Nodeunit documentation \\
+https://github.com/caolan/nodeunit \\
+% It might be better to put the URLs in the "References" section and add a [\ref{}] here
+We are using nodeunit to test our virtual machine.
+Since the c0 bytecode has many different opcodes that it uses, it is very easy
+for mistakes in the virtual machine to go unnoticed.
+To prevent this, we are using the nodeunit library to write unit tests for our
+code.
+This has already helped us to find and solve multiple bugs in the VM, and having
+these unit tests will make sure that we can solve any bugs that occur as the
+result of future changes in the code.
+\item C0vm Assignment Handout \\
+https://www.cs.cmu.edu/~rjsimmon/15122-f14/prog/c0vm-writeup.pdf \\
+This document details how each opcode in the c0 bytecode language works,
+as well as other important implementation details for the c0 virtual machine.
+It has been an important reference while developing a JavaScript version
+of the c0 virtual machine.
+\end{itemize}
+So far, the most important thing we have learned is that good unit tests are
+vital for developing this sort of project. Without unit tests that verify
+each opcode used by the virtual machine, many bugs would have gone unnoticed,
+causing problems later down the line. If we only found these bugs by using
+the frontend, they would have been much harder to debug, as there would have
+been much more code to work through.
--- a/progress_report/new-gantt.png
+++ b/progress_report/new-gantt.png
--- a/progress_report/old-gantt.jpg
+++ b/progress_report/old-gantt.jpg
--- a/progress_report/old-gantt.png
+++ b/progress_report/old-gantt.png
--- a/progress_report/overview.fdb_latexmk
+++ b/progress_report/overview.fdb_latexmk
@@ -0,0 +1,10 @@
+# Fdb version 3
+["latex"] 1429036987 "overview.tex" "overview.dvi" "overview" 1429036988
+  "/usr/local/texlive/2014/texmf-dist/web2c/texmf.cnf" 1398200874 31722 4f52421e59a4b9e910cf18e64c1f2b4a ""
+  "/usr/local/texlive/2014/texmf-var/web2c/pdftex/latex.fmt" 1401025988 3831950 412798929e0196806f9f91e131a01806 ""
+  "/usr/local/texlive/2014/texmf.cnf" 1401025936 577 a59edbde8d3a8c549d0eeaab1739e2ff ""
+  "overview.aux" 1429036987 8 a94a2480d3289e625eea47cd1b285758 ""
+  "overview.tex" 1429036311 1357 cfaf2a8de5eaf66d6fce726acdb307d4 ""
+  (generated)
+  "overview.log"
+  "overview.dvi"
--- a/progress_report/overview.fls
+++ b/progress_report/overview.fls
@@ -0,0 +1,6 @@
+PWD /Users/shyam/Dropbox/cdb/progress_report
+INPUT /usr/local/texlive/2014/texmf.cnf
+INPUT /usr/local/texlive/2014/texmf-dist/web2c/texmf.cnf
+INPUT /usr/local/texlive/2014/texmf-var/web2c/pdftex/latex.fmt
+INPUT overview.tex
+OUTPUT overview.log
--- a/progress_report/overview.tex
+++ b/progress_report/overview.tex
@@ -0,0 +1,22 @@
+\section{Overview}
+\subsection{Purpose of the Report}
+This report serves as an update to the reader on the progress the c0db team has
+made on the C0 Debugger during the first month of work. The report will detail
+what has been accomplished so far, what is in progress, what is planned for the
+future, and any changes that will be made to the original plan of action. In
+addition, the report will detail new literature that has been gathered and
+used.
+\subsection{Purpose of the Project}
+The purpose of this project is to build a web application that can debug C0
+code and can aid in a student's understanding of fundamental computational
+models. This project will benefit students in 15-122 Principals of Imperative
+Computation at Carnegie Mellon University by helping them create correct
+programs. The C0 Debugger will enable students to understand how their programs
+execute and find where problems originate more easily than with existing tools.
+In addition to debugging, students will have better knowledge for how the
+underlying computation model works when evaluating their code.
+\par
+The C0 Debugger will also enable students to test simple programs with little
+setup, using only a web browser. They will no longer have to set up and become
+familiar with a Unix environment before they can program, making C0 accessible
+to more people, more quickly.
--- a/progress_report/progress.tex
+++ b/progress_report/progress.tex
@@ -0,0 +1,45 @@
+\section{Progress}
+We are nearing completion on the virtual machine upon which the debugger will
+run. Moving forward, the front end team will polish the existing interface, and
+expand it to control the debugger. The back end team will work on the core
+functionality of the debugger and continue to fix bugs with the virtual machine.
+This places us two weeks behind schedule over all, as we planned to have the
+virtual machine finished by April 1\textsuperscript{st}.
+
+\subsection*{Front End: Status}
+The front end team is keeping pace with the back end team, but is still two
+weeks behind schedule. We have a working interface where users can input,
+compile, and run C0 programs, but there are no debugging features.
+
+\subsection*{Front End: Projections}
+We will modify our schedule to allow more time for the work on the debugger.
+This time will come from a shortened user testing and revision period. That
+said, because of our thorough work on the virtual machine, implementing the
+debugger should progress more rapidly than originally planned. The modified
+schedule is depicted in our updated Gannt chart (Figure \ref{gannt}).
+
+\subsection*{Back End: Status}
+The back end team is also two weeks behind schedule. The virtual machine, along
+with most library functions needed to run programs, is complete and working
+well. The team has started working on stepping through program execution, but
+those features have not yet been incorporated with the rest of the application.
+
+\subsection*{Back End: Projections}
+In the coming time, the back end team will implement the remaining library
+functions, then transition all of their efforts to the debugging features. Like
+the front end team, this transition was originally scheduled for
+April\textsuperscript{st}, but will now occur in the next week.
+
+\includegraphics{gannt}
+
+Our revised Gannt chart features two key changes. The back end and front end
+sections were modified such that the transition of effort from the virtual
+machine to the debugger aligns with where that actually happened. As a result,
+the testing and revision section was push back. We are now aiming to start
+testing and revision the week of April 20\textsuperscript{th}.
+
+\subsection*{Quantification of Progress}
+Currently, we have over 50 test files that we use to check for correctness of
+our virtual machine. We currently pass 44 test cases, and are working to have
+the rest functioning correctly soon. Once the debugger is more feature complete,
+we will focus more on user feedback to assess progress.
--- a/progress_report/progress.tex.project.vim
+++ b/progress_report/progress.tex.project.vim
@@ -0,0 +1,23 @@
+" ATP project vim script: Tue Apr 14, 2015 at 08:36 PM -0400.
+
+let b:atp_MainFile = 'progress.tex'
+let g:atp_mapNn = 0
+let b:atp_autex = 1
+let b:atp_TexCompiler = 'pdftex'
+let b:atp_TexOptions = '-synctex=1'
+let b:atp_TexFlavor = 'plaintex'
+let b:atp_auruns = '1'
+let b:atp_ReloadOnError = '1'
+let b:atp_OutDir = '/Users/shyam/Dropbox/cdb/progress_report'
+let b:atp_OpenViewer = '1'
+let b:atp_XpdfServer = 'progress'
+let b:atp_Viewer = 'okular'
+let b:TreeOfFiles = {}
+let b:ListOfFiles = []
+let b:TypeDict = {}
+let b:LevelDict = {}
+let b:atp_BibCompiler = 'bibtex'
+let b:atp_StarEnvDefault = ''
+let b:atp_StarMathEnvDefault = ''
+let b:atp_updatetime_insert = 4000
+let b:atp_updatetime_normal = 2000
--- a/progress_report/progress_report.dvi
+++ b/progress_report/progress_report.dvi
--- a/progress_report/progress_report.fdb_latexmk
+++ b/progress_report/progress_report.fdb_latexmk
@@ -0,0 +1,86 @@
+# Fdb version 3
+<<<<<<< HEAD
+["latex"] 1429057416 "progress_report.tex" "progress_report.dvi" "progress_report" 1429057422
+=======
+["latex"] 1429044499 "progress_report.tex" "progress_report.dvi" "progress_report" 1429044577
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
+  "/usr/local/texlive/2014/texmf-dist/fonts/map/fontname/texfonts.map" 1272929888 3287 e6b82fe08f5336d4d5ebc73fb1152e87 ""
+  "/usr/local/texlive/2014/texmf-dist/fonts/tfm/public/cm/cmr10.tfm" 1136768653 1296 45809c5a464d5f32c8f98ba97c1bb47f ""
+  "/usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txb.tfm" 1136768653 2452 76194099b4f1c022cb59f4564251c4fe ""
+  "/usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txr.tfm" 1136768653 2408 aec793a3c45e495f7ad15b227c91f508 ""
+  "/usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txsy.tfm" 1136768653 1268 1d124f224979493f8fd017a7597ea1cd ""
+  "/usr/local/texlive/2014/texmf-dist/tex/generic/ifxetex/ifxetex.sty" 1284331290 1458 43ab4710dc82f3edeabecd0d099626b2 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/atbegshi.sty" 1335995445 24460 92f559a71aac869021852c227c704b38 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/gettitlestring.sty" 1303254447 8237 52810bdb4db2270e717422560a104aea ""
+  "/usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty" 1338332114 189108 8b3553a56c83ff61acecb36b75d817e2 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty" 1338332114 70752 45fa392800e07da61fa13446ad46b34d ""
+  "/usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/ifpdf.sty" 1303254447 7140 ece2cc23d9f20e1f53975ac167f42d3e ""
+  "/usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/ifvtex.sty" 1335995445 6797 68c89f65e01894df882dd523d3fc0a8f ""
+  "/usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/infwarerr.sty" 1335995445 8253 3bdedc8409aa5d290a2339be6f09af03 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/ltxcmds.sty" 1335995445 18425 775b341047ce304520cc7c11ca41392e ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/base/article.cls" 1399675188 20496 66dd832c447553f6776fbeac03bb0580 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/base/ifthen.sty" 1399675188 4947 22c4b902063e8ce2efcc2a8495ecb800 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/base/size11.clo" 1399675188 8983 e08a9a7009d9a8f8c6507333f96e336e ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/eso-pic/eso-pic.sty" 1381444076 11590 2a66b78f3da61ad137452c2777f21b6b ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/geometry/geometry.sty" 1284422013 40502 e003406220954b0716679d7928aedd8a ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/graphics/dvips.def" 1399675188 5104 e68b64366d1946a5893a7f717264ec59 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/graphics/graphics.sty" 1254151804 14183 42a8fc761b806986eef292369afc2988 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/graphics/graphicx.sty" 1399675188 7911 bf0a64f89bfb668c239ddf6324bf4afb ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/graphics/keyval.sty" 1399675188 2317 0ace13e225e9d95dd9defe947adc9fbb ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/graphics/trig.sty" 1156702488 3153 c50e6bd54d2dd3933fc52bcf369bec4a ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/hdvips.def" 1352416072 3471 43fa5241d35e8bdbf02746c6d8e25fc2 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/hyperref.sty" 1352416072 231792 5fc9dc7dd667e773a766ecc63bba7f4b ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/nameref.sty" 1351899753 12847 25b617d63258c4f72870c883493a3cf8 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/pd1enc.def" 1352416072 14005 155ac8fad2e5dd7c2cdd130fabd96633 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/pdfmark.def" 1352416072 49315 059e7f302e066f22f383833cd87167cb ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/latexconfig/color.cfg" 1254097189 802 7b8c8d72c24d795ed7720e4dfd29bff3 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/latexconfig/graphics.cfg" 1278958963 3563 d35e897cae3b8c6848f6677b73370b54 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/latexconfig/hyperref.cfg" 1254097189 235 6031e5765137be07eed51a510b2b8fb7 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/oberdiek/auxhook.sty" 1303254447 3834 707ef09f31d7d2ea47ba89974755dfe0 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/oberdiek/kvoptions.sty" 1335995445 22417 c74ff4af6a1aa2b65d1924020edbbe11 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty" 1303254447 9581 1158efc648bc09d5064db5703c882159 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/pdfpages/pdfpages.sty" 1377467854 51227 e7dc1f34ba805af6251ecb7986bb034f ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/pdfpages/ppnull.def" 1377467854 2528 737efa41d2b4535305b16bdebc3d7d8e ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/pdfpages/pppdftex.def" 1377467854 5975 e550dcf6f005a7223bb41a05edf0e99d ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/setspace/setspace.sty" 1324344192 22913 a27d7908fc6f0385466454a966a316eb ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/tocloft/tocloft.sty" 1367531278 34706 345df874e59e023274392bd0cf090d66 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/tools/array.sty" 1399675188 13073 a6e28ede26c83d406e124b12f368174f ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/tools/calc.sty" 1399675188 10002 f32f4490d0c87a7854adf544bd459155 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/tools/tabularx.sty" 1400196978 6922 d73f54a1f22489be96930629013f1304 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omltxmi.fd" 1137111002 492 e7f8afe4428797548d4301de03a1b15f ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxr.fd" 1137111002 857 81ff640acbcd7da3dc30601847d7e35a ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxsy.fd" 1137111002 329 6ac7e19535b9f1d64e4d8e3f77dc30a3 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omxtxex.fd" 1137111002 312 11fe1916b0a13a81a05234a6fc7f8738 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/ot1txr.fd" 1137111002 1271 4e3afbd8e832f2f9c7f064894e6e68e4 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/txfonts.sty" 1206746551 50381 d367461010070c7a491b1f6979ab2062 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/utxexa.fd" 1137111002 310 1b00b0b05685b816e4c6caccce437e0d ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/url/url.sty" 1388531844 12796 8edb7d69a20b857904dd0ea757c14ec9 ""
+  "/usr/local/texlive/2014/texmf-dist/tex/latex/xcolor/xcolor.sty" 1169481954 55224 a43bab84e0ac5e6efcaf9a98bde73a94 ""
+  "/usr/local/texlive/2014/texmf-dist/web2c/texmf.cnf" 1398200874 31722 4f52421e59a4b9e910cf18e64c1f2b4a ""
+  "/usr/local/texlive/2014/texmf-var/web2c/pdftex/latex.fmt" 1401025988 3831950 412798929e0196806f9f91e131a01806 ""
+  "/usr/local/texlive/2014/texmf.cnf" 1401025936 577 a59edbde8d3a8c549d0eeaab1739e2ff ""
+<<<<<<< HEAD
+  "old-gantt.png" 1429057390 101185 f09f139493b49efd4a4a3b3fe455d710 ""
+  "progress_report.aux" 1429057422 1054 1fb7c5c88c3fe5c21808963cf33f2978 ""
+  "progress_report.out" 1429057422 236 3411de8a1192db7b41eeb11bf4c93fef ""
+  "progress_report.tex" 1429057414 7263 ac2a94d16fa7d5564a6b25389d187b52 ""
+  "progress_report.toc" 1429057417 0 d41d8cd98f00b204e9800998ecf8427e ""
+  (generated)
+  "progress_report.aux"
+  "progress_report.log"
+  "progress_report.out"
+  "progress_report.toc"
+  "progress_report.dvi"
+=======
+  "old-gantt.jpg" 1429044440 24493 24188bdf4f5434787c664b216e3898f2 ""
+  "progress_report.aux" 1429044500 1054 1fb7c5c88c3fe5c21808963cf33f2978 ""
+  "progress_report.out" 1429044500 236 3411de8a1192db7b41eeb11bf4c93fef ""
+  "progress_report.tex" 1429044508 7262 ec5dd8aff911c63e55f0b215ebc5fca1 ""
+  "progress_report.toc" 1429044500 0 d41d8cd98f00b204e9800998ecf8427e ""
+  (generated)
+  "progress_report.dvi"
+  "progress_report.out"
+  "progress_report.toc"
+  "progress_report.aux"
+  "progress_report.log"
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
--- a/progress_report/progress_report.fls
+++ b/progress_report/progress_report.fls
@@ -0,0 +1,133 @@
+PWD /Users/shyam/Dropbox/cdb/progress_report
+INPUT /usr/local/texlive/2014/texmf.cnf
+INPUT /usr/local/texlive/2014/texmf-dist/web2c/texmf.cnf
+INPUT /usr/local/texlive/2014/texmf-var/web2c/pdftex/latex.fmt
+INPUT progress_report.tex
+OUTPUT progress_report.log
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/base/article.cls
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/base/article.cls
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/base/size11.clo
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/base/size11.clo
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/map/fontname/texfonts.map
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/map/fontname/texfonts.map
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/cm/cmr10.tfm
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/setspace/setspace.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/setspace/setspace.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/geometry/geometry.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/geometry/geometry.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/keyval.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/keyval.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/ifpdf.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/ifpdf.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/ifvtex.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/ifvtex.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/ifxetex/ifxetex.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/ifxetex/ifxetex.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/tools/tabularx.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/tools/tabularx.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/tools/array.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/tools/array.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/tocloft/tocloft.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/tocloft/tocloft.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/graphicx.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/graphicx.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/graphics.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/graphics.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/trig.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/trig.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/latexconfig/graphics.cfg
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/latexconfig/graphics.cfg
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/dvips.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/graphics/dvips.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/pdfpages/pdfpages.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/base/ifthen.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/base/ifthen.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/tools/calc.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/tools/calc.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/eso-pic/eso-pic.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/eso-pic/eso-pic.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/atbegshi.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/atbegshi.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/infwarerr.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/infwarerr.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/ltxcmds.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/xcolor/xcolor.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/xcolor/xcolor.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/xcolor/xcolor.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/latexconfig/color.cfg
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/latexconfig/color.cfg
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/pdfpages/pppdftex.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/pdfpages/pppdftex.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/pdfpages/ppnull.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/pdfpages/ppnull.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/hyperref.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/hyperref.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/hobsub-hyperref.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/hobsub-generic.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/oberdiek/auxhook.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/oberdiek/auxhook.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/oberdiek/kvoptions.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/pd1enc.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/pd1enc.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/latexconfig/hyperref.cfg
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/latexconfig/hyperref.cfg
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/url/url.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/url/url.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/hdvips.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/hdvips.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/pdfmark.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/pdfmark.def
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/oberdiek/rerunfilecheck.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/txfonts.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/txfonts.sty
+INPUT progress_report.aux
+INPUT progress_report.aux
+OUTPUT progress_report.aux
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omltxmi.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omltxmi.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxsy.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxsy.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omxtxex.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omxtxex.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/utxexa.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/utxexa.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/ot1txr.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/ot1txr.fd
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txr.tfm
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/nameref.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/hyperref/nameref.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/gettitlestring.sty
+INPUT /usr/local/texlive/2014/texmf-dist/tex/generic/oberdiek/gettitlestring.sty
+INPUT progress_report.out
+INPUT progress_report.out
+INPUT progress_report.out
+INPUT progress_report.out
+INPUT ./progress_report.out
+INPUT ./progress_report.out
+OUTPUT progress_report.out
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txb.tfm
+OUTPUT progress_report.dvi
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txr.tfm
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txb.tfm
+INPUT progress_report.toc
+INPUT progress_report.toc
+OUTPUT progress_report.toc
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txr.tfm
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txb.tfm
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxr.fd
+INPUT /usr/local/texlive/2014/texmf-dist/tex/latex/txfonts/omstxr.fd
+INPUT /usr/local/texlive/2014/texmf-dist/fonts/tfm/public/txfonts/txsy.tfm
+<<<<<<< HEAD
+INPUT old-gantt.png
+INPUT old-gantt.png
+=======
+INPUT old-gantt.jpg
+INPUT old-gantt.jpg
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
--- a/progress_report/progress_report.out
+++ b/progress_report/progress_report.out
@@ -0,0 +1,19 @@
+\BOOKMARK [1][-]{section.1}{Overview}{}% 1
+\BOOKMARK [2][-]{subsection.1.1}{Purpose of the Report}{section.1}% 2
+\BOOKMARK [2][-]{subsection.1.2}{Purpose of the Project}{section.1}% 3
+\BOOKMARK [1][-]{section.2}{Literature Review}{}% 4
+<<<<<<< HEAD
+\BOOKMARK [1][-]{section.3}{Progress}{}% 5
+\BOOKMARK [2][-]{subsection.3.1}{Front End: Status}{section.3}% 6
+\BOOKMARK [2][-]{subsection.3.2}{Front End: Projections}{section.3}% 7
+\BOOKMARK [2][-]{subsection.3.3}{Back End: Status}{section.3}% 8
+\BOOKMARK [2][-]{subsection.3.4}{Back End: Projections}{section.3}% 9
+\BOOKMARK [2][-]{subsection.3.5}{Quantification of Progress}{section.3}% 10
+\BOOKMARK [1][-]{section.4}{Recommendations}{}% 11
+\BOOKMARK [2][-]{subsection.4.1}{Changes}{section.4}% 12
+\BOOKMARK [2][-]{subsection.4.2}{New Timeline}{section.4}% 13
+\BOOKMARK [2][-]{subsection.4.3}{Future Phases}{section.4}% 14
+\BOOKMARK [2][-]{subsection.4.4}{Redefined Goals}{section.4}% 15
+\BOOKMARK [1][-]{section.5}{Discussion}{}% 16
+=======
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
--- a/progress_report/progress_report.pdf
+++ b/progress_report/progress_report.pdf
--- a/progress_report/progress_report.tex
+++ b/progress_report/progress_report.tex
@@ -0,0 +1,259 @@
+\documentclass[11pt]{article}
+
+\usepackage{setspace}
+\usepackage[margin=1in]{geometry}
+
+% Make table of contents look better
+\usepackage{tabularx}
+\usepackage{tocloft}
+\renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}}
+
+\usepackage{graphicx}
+\usepackage{pdfpages}
+\usepackage{hyperref}
+
+% \usepackage[ngerman]{babel}
+% \usepackage[T1]{fontenc}
+% \usepackage[ansinew]{inputenc}
+% \usepackage{lmodern}
+
+% Times New Roman font
+\usepackage{txfonts}
+
+\begin{document}
+
+\setlength{\parindent}{2em}
+
+\begin{titlepage}
+\clearpage
+\thispagestyle{empty}
+
+\begin{center}
+{\bf Technical Communication for Computer Scientists: 15-221}\\
+{\bf Spring 2015}\\
+
+\vspace{25 mm}
+
+{\bf Progress Report:}\\
+{\bf C0 Debugger}\\
+\vspace{25 mm}
+
+Aaron Gutierrez\\
+Mitchell Plamann\\
+Shyam Raghavan\\
+Suhaas Reddy\\
+
+\vspace{25 mm}
+
+{\bf Submitted to}\\
+Thomas M. Keating\\
+Assistant Teaching Professor\\
+Computer Science Department\\
+School of Computer Science\\
+
+\vspace{25 mm}
+
+{\bf Prepared and Submitted by}\\
+Shyam Raghavan - April 14, 2015
+\end{center}
+\end{titlepage}
+
+\pagenumbering{roman}
+\tableofcontents
+\newpage
+
+\pagenumbering{arabic}
+
+\section{Overview}
+\subsection{Purpose of the Report}
+This report serves as an update to the reader on the progress the c0db team has
+made on the C0 Debugger during the first month of work. The report will detail
+what has been accomplished so far, what is in progress, what is planned for the
+future, and any changes that will be made to the original plan of action. In
+addition, the report will detail new literature that has been gathered and
+used.
+\subsection{Purpose of the Project}
+The purpose of this project is to build a web application that can debug C0
+code and can aid in a student's understanding of fundamental computational
+models. This project will benefit students in 15-122 Principals of Imperative
+Computation at Carnegie Mellon University by helping them create correct
+programs. The C0 Debugger will enable students to understand how their programs
+execute and find where problems originate more easily than with existing tools.
+In addition to debugging, students will have better knowledge for how the
+underlying computation model works when evaluating their code.
+\par
+The C0 Debugger will also enable students to test simple programs with little
+setup, using only a web browser. They will no longer have to set up and become
+familiar with a Unix environment before they can program, making C0 accessible
+to more people, more quickly.
+\section{Literature Review}
+Since the start of our project, we have found multiple new information sources;
+the following are the most important ones.
+\begin{itemize}
+\item Nodeunit documentation \\
+    https://github.com/caolan/nodeunit
+    \par
+    We are using nodeunit to test our virtual machine.
+    Since the c0 bytecode has many different opcodes that it uses, it is very
+    easy for mistakes in the virtual machine to go unnoticed.
+    To prevent this, we are using the nodeunit library to write unit tests for
+    our code.
+    This has already helped us to find and solve multiple bugs in the VM, and
+    having these unit tests will make sure that we can solve any bugs that
+    occur as the result of future changes in the code.
+\item c0vm Assignment Handout \\
+    https://www.cs.cmu.edu/~rjsimmon/15122-f14/prog/c0vm-writeup.pdf
+    \par
+    This document details how each opcode in the c0 bytecode language works,
+    as well as other important implementation details for the c0 virtual
+    machine. It has been an important reference while developing a JavaScript
+    version of the c0 virtual machine.
+\item Common Gateway Interface Support Documentation \\
+    https://docs.python.org/2/library/cgi.html
+    \par
+    This document explains the support module defined by Python 2.7.10 for
+    common gateway interfaces. A common gateway interface script is usually
+    invoked by a server to process user input submitted through an HTML
+    element. This piece of documentation is an important reference for
+    developing the flow of information from c0 code to c0 bytecode to a
+    working virtual machine.
+\end{itemize}
+So far, the most important thing we have learned is that good unit tests are
+vital for developing this sort of project. Without unit tests that verify
+each opcode used by the virtual machine, many bugs would have gone unnoticed,
+causing problems later down the line. If we only found these bugs by using
+the frontend, they would have been much harder to debug, as there would have
+been much more code to work through.
+\section{Progress}
+<<<<<<< HEAD
+\begin{figure}[h]
+  \centering
+  \includegraphics[width=\linewidth]{old-gantt.png}
+  \caption{Old Project Gantt Chart}
+  \label{fig:old-gantt}
+\end{figure}
+We are nearing completion on the virtual machine upon which the debugger will
+run. Moving forward, the front end team will polish the existing interface, and
+expand it to control the debugger. The back end team will work on the core
+functionality of the debugger and continue to fix bugs with the virtual machine.
+This places us two weeks behind schedule over all, as we planned to have the
+virtual machine finished by April 1\textsuperscript{st}.
+\subsection{Front End: Status}
+The front end team is keeping pace with the back end team, but is still two
+weeks behind schedule. We have a working interface where users can input,
+compile, and run C0 programs, but there are no debugging features.
+\subsection{Front End: Projections}
+We will modify our schedule to allow more time for the work on the debugger.
+This time will come from a shortened user testing and revision period. That
+said, because of our thorough work on the virtual machine, implementing the
+debugger should progress more rapidly than originally planned. The modified
+schedule is depicted in our updated Gannt chart (Figure 2, below).
+\subsection{Back End: Status}
+The back end team is also two weeks behind schedule. The virtual machine, along
+with most library functions needed to run programs, is complete and working
+well. The team has started working on stepping through program execution, but
+those features have not yet been incorporated with the rest of the application.
+\subsection{Back End: Projections}
+In the coming time, the back end team will implement the remaining library
+functions, then transition all of their efforts to the debugging features. Like
+the front end team, this transition was originally scheduled for
+April\textsuperscript{st}, but will now occur in the next week.
+\par
+\begin{figure}[h]
+  \includegraphics[width=\linewidth]{new-gantt.png}
+  \caption{New Project Gantt Chart}
+  \label{fig:new-gantt}
+\end{figure}
+Our revised Gannt chart features two key changes. The back end and front end
+sections were modified such that the transition of effort from the virtual
+machine to the debugger aligns with where that actually happened. As a result,
+the testing and revision section was push back. We are now aiming to start
+testing and revision the week of April 20\textsuperscript{th}.
+\subsection{Quantification of Progress}
+Currently, we have over 50 test files that we use to check for correctness of
+our virtual machine. We currently pass 44 test cases, and are working to have
+the rest functioning correctly soon. Once the debugger is more feature complete,
+we will focus more on user feedback to assess progress.
+\section{Recommendations}
+\subsection{Changes}
+There are three major changes to the project plan: the frontend and backend
+deadlines have moved back several days, the user testing and revisions period
+have shifted back accordingly and have shortened, and the frontend goal
+categories have been redefined. These changes can be identified in the above
+Gantt charts by in shifts in the bars of the Gantt chart. The development bars
+have increased in relative size while the testing and revising bars have shrunk.
+\subsection{New Timeline}
+=======
+\section{Recommendations}
+\begin{figure}[h]
+  \centering
+  \includegraphics[width=\linewidth]{old-gantt.jpg}
+  \caption{Old Project Gantt Chart}
+  \label{fig:old-gantt}
+\end{figure}
+\begin{figure}[h]
+  \centering
+  \includegraphics[width=\linewidth]{new-gantt.jpg}
+  \caption{New Project Gantt Chart}
+  \label{fig:new-gantt}
+\end{figure}
+There are three major changes to the project plan: the frontend and backend
+deadlines have moved back several days, the user testing and revisions period
+have shifted back accordingly and have shortened, the frontend goal categories
+have been redefined. These changes can be identified in the above Gantt charts
+by in shifts in the bars of the Gantt chart. The development bars have
+increased in relative size while the testing and revising bars have shrunk.
+\par
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
+The frontend and backend periods needed to shift backwards simply due to the
+group’s initial underestimation of the amount of time required to create a
+reasonable product. The team believes additional development time on the
+backend and frontend until the 20th of April will enable the creation of a high
+quality product with a robust user interface and powerful c0 virtual machine.
+Without this pushback the team currently has a working prototype with a basic
+user interface and native function calls implemented, but the project has yet
+to include several important features considered necessary for useful
+application by students.
+<<<<<<< HEAD
+\subsection{Future Phases}
+=======
+\par
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
+The user testing and adjustments periods have shrunk due to the increased
+development time. The team decided to avoid user testing and adjustments during
+the main development phase, but due to the time pressure this caused the
+testing and adjustment phases to shrink by several days each and overlap
+significantly. The team hopes to consistently implement changes as students
+provide feedback so that the overlap still provides time to implement
+suggestions.
+<<<<<<< HEAD
+\subsection{Redefined Goals}
+=======
+\par
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
+The redefined goals within the frontend category reflect altered priorities of
+the project as a whole. Rather than having the project work to explain topics
+to the user, the project will be designed to simply run user code and step
+through user code with the assumption that the user already understands how to
+use the program. The instructors of 15-122 have already been informed of c0db,
+so hopefully the TAs of the course could provide their students with brief
+tutorials for c0db and its uses. This shift away from explanation allows the
+team to focus more on providing user interface features which will more
+directly aid in student code development. These features include code stepping
+and highlighting as well as annotated bytecode as listed in the Gantt chart
+above.
+<<<<<<< HEAD
+\section{Discussion}
+These changes provide for a more accurate description of the timeline and the
+remaining work to be accomplished before the deatline. The team believes that
+this project still has a high likelihood of being completed, and this will
+allow for the Fall 2015 students of 15-122 being able to better understand
+and use C0. We also feel that these changes, in the long run, will lead to a
+better, more polished product. While our deliverables do not change, the focus
+of the product team has changed to avoid user testing and adjustments during
+the development phase and consistently implement changes as students provide
+feedback. In the long run, the team believes that we will accomplish the final
+product in the timeline specified.
+=======
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
+\end{document}
--- a/progress_report/progress_report.tex.project.vim
+++ b/progress_report/progress_report.tex.project.vim
@@ -0,0 +1,30 @@
+" ATP project vim script: Tue Apr 14, 2015 at 02:37 PM -0400.
+
+let b:atp_MainFile = 'progress_report.tex'
+let g:atp_mapNn = 0
+let b:atp_autex = 1
+let b:atp_TexCompiler = 'pdftex'
+let b:atp_TexOptions = '-synctex=1'
+<<<<<<< HEAD
+let b:atp_TexFlavor = 'tex'
+=======
+let b:atp_TexFlavor = 'plaintex'
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
+let b:atp_auruns = '1'
+let b:atp_ReloadOnError = '1'
+let b:atp_OutDir = '/Users/shyam/Dropbox/cdb/progress_report'
+let b:atp_OpenViewer = '1'
+let b:atp_XpdfServer = 'progress_report'
+let b:atp_Viewer = 'okular'
+let b:TreeOfFiles = {}
+let b:ListOfFiles = []
+let b:TypeDict = {}
+let b:LevelDict = {}
+let b:atp_BibCompiler = 'bibtex'
+let b:atp_StarEnvDefault = ''
+let b:atp_StarMathEnvDefault = ''
+let b:atp_updatetime_insert = 4000
+let b:atp_updatetime_normal = 2000
+let b:atp_LocalCommands = []
+let b:atp_LocalEnvironments = []
+let b:atp_LocalColors = []
--- a/progress_report/progress_report_aux
+++ b/progress_report/progress_report_aux
@@ -0,0 +1,47 @@
+\relax 
+\providecommand\hyper@newdestlabel[2]{}
+\providecommand\HyperFirstAtBeginDocument{\AtBeginDocument}
+\HyperFirstAtBeginDocument{\ifx\hyper@anchor\@undefined
+\global\let\oldcontentsline\contentsline
+\gdef\contentsline#1#2#3#4{\oldcontentsline{#1}{#2}{#3}}
+\global\let\oldnewlabel\newlabel
+\gdef\newlabel#1#2{\newlabelxx{#1}#2}
+\gdef\newlabelxx#1#2#3#4#5#6{\oldnewlabel{#1}{{#2}{#3}}}
+\AtEndDocument{\ifx\hyper@anchor\@undefined
+\let\contentsline\oldcontentsline
+\let\newlabel\oldnewlabel
+\fi}
+\fi}
+\global\let\hyper@last\relax 
+\gdef\HyperFirstAtBeginDocument#1{#1}
+<<<<<<< HEAD
+\providecommand\HyField@AuxAddToFields[1]{}
+\providecommand\HyField@AuxAddToCoFields[2]{}
+=======
+\providecommand*\HyPL@Entry[1]{}
+\HyPL@Entry{0<</S/D>>}
+\HyPL@Entry{1<</S/r>>}
+\HyPL@Entry{2<</S/D>>}
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
+\@writefile{toc}{\contentsline {section}{\numberline {1}Overview}{1}{section.1}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.1}Purpose of the Report}{1}{subsection.1.1}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {1.2}Purpose of the Project}{1}{subsection.1.2}}
+\@writefile{toc}{\contentsline {section}{\numberline {2}Literature Review}{1}{section.2}}
+<<<<<<< HEAD
+\@writefile{toc}{\contentsline {section}{\numberline {3}Progress}{2}{section.3}}
+\@writefile{lof}{\contentsline {figure}{\numberline {1}{\ignorespaces Old Project Gantt Chart}}{2}{figure.1}}
+\newlabel{fig:old-gantt}{{1}{2}{Old Project Gantt Chart}{figure.1}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.1}Front End: Status}{2}{subsection.3.1}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.2}Front End: Projections}{2}{subsection.3.2}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.3}Back End: Status}{3}{subsection.3.3}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.4}Back End: Projections}{3}{subsection.3.4}}
+\@writefile{lof}{\contentsline {figure}{\numberline {2}{\ignorespaces New Project Gantt Chart}}{3}{figure.2}}
+\newlabel{fig:new-gantt}{{2}{3}{New Project Gantt Chart}{figure.2}{}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {3.5}Quantification of Progress}{3}{subsection.3.5}}
+\@writefile{toc}{\contentsline {section}{\numberline {4}Recommendations}{4}{section.4}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {4.1}Changes}{4}{subsection.4.1}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {4.2}New Timeline}{4}{subsection.4.2}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {4.3}Future Phases}{4}{subsection.4.3}}
+\@writefile{toc}{\contentsline {subsection}{\numberline {4.4}Redefined Goals}{4}{subsection.4.4}}
+=======
+>>>>>>> ff581d8a8ce9932bf474596368f94b00770b98d9
--- a/proposal/letter.pdf
+++ b/proposal/letter.pdf
--- a/proposal/letter.tex
+++ b/proposal/letter.tex
--- a/proposal/proposal.pdf
+++ b/proposal/proposal.pdf
--- a/proposal/proposal.tex
+++ b/proposal/proposal.tex
--- a/proposal/proposal.tex.project.vim
+++ b/proposal/proposal.tex.project.vim
@@ -0,0 +1,26 @@
+" ATP project vim script: Tue Apr 14, 2015 at 02:43 PM -0400.
+
+let b:atp_MainFile = 'proposal.tex'
+let g:atp_mapNn = 0
+let b:atp_autex = 1
+let b:atp_TexCompiler = 'pdflatex'
+let b:atp_TexOptions = '-synctex=1'
+let b:atp_TexFlavor = 'tex'
+let b:atp_auruns = '1'
+let b:atp_ReloadOnError = '1'
+let b:atp_OutDir = '/Users/shyam/Dropbox/cdb/proposal'
+let b:atp_OpenViewer = '1'
+let b:atp_XpdfServer = 'proposal'
+let b:atp_Viewer = 'okular'
+let b:TreeOfFiles = {}
+let b:ListOfFiles = []
+let b:TypeDict = {}
+let b:LevelDict = {}
+let b:atp_BibCompiler = 'bibtex'
+let b:atp_StarEnvDefault = ''
+let b:atp_StarMathEnvDefault = ''
+let b:atp_updatetime_insert = 4000
+let b:atp_updatetime_normal = 2000
+let b:atp_LocalCommands = []
+let b:atp_LocalEnvironments = []
+let b:atp_LocalColors = []
--- a/public/vm/Makefile
+++ b/public/vm/Makefile
@@ -1,4 +1,7 @@
-FILES = c0vm.js bytecode-parser.js byte-stream.js opcodes.js index.js
+FILES = c0vm.js bytecode-parser.js byte-stream.js opcodes.js c0ffi.js index.js 

 all: $(FILES)
 	browserify $(FILES) -o vm.js
+
+clean:
+	rm -f vm.js
--- a/public/vm/byte-stream.js
+++ b/public/vm/byte-stream.js
--- a/public/vm/bytecode-parser.js
+++ b/public/vm/bytecode-parser.js
@@ -4,21 +4,8 @@ byte_stream = require("./byte-stream");
 // This is a simple, kinda hacky bytecode parser for .bc0 files
 // Now takes in raw bytecode
 function getBytes(data) {
-  /*
-    var data = fs.readFileSync(filename);
-    
-    if (data == null) {
-        if (err["code"] === "ENOENT")
-            console.log("Error: file " + filename + " does not exist.");
-        else
-            console.log("Error: " + err);
-        return;
-    }
-    */
-
    // Data contains our file, but we want it as a string
    var string_data = data.toString();
-    console.log(string_data);

    // Strip all the comments for easier parsing
    var without_comments = string_data.replace(new RegExp("#.*", "gi"), "");
@@ -33,15 +20,37 @@ function getBytes(data) {
        });

    // We now have an array of bytes. That's probably everything we need, right?
-    console.log(bytes);
    return bytes;

 }

+function getLineNumbers(data) {
+    var string_data = data.toString();
+
+    // Strip all the comments for easier parsing
+    var without_comments = string_data.replace(new RegExp("#.*", "gi"), "");
+
+    // Each byte should now be a pair of two hex digits.
+    // Put all these in an array.
+    var lines = without_comments.split("\n");
+    var line_numbers = [];
+    for (var line_number = 0; line_number < lines.length; line_number++ ) {
+        lines[line_number].replace(
+            new RegExp("([0123456789ABCDEF][0123456789ABCDEF])", "gi"),
+            function(next_byte) {
+                // +1 because lines start at 1, for some weird reason.
+                // Who doesn't start counting at 0?
+                line_numbers.push(line_number+1);
+            });
+    }
+    return line_numbers;
+}
+
 var FunctionInfo = function (stream) {
    this.num_args = stream.get_u2();
    this.num_vars = stream.get_u2();
    this.code_length = stream.get_u2();
+    this.code_byte_offset = stream.index;
    this.code = stream.get_bytes(this.code_length);
 }

@@ -50,8 +59,9 @@ var NativeInfo = function (stream) {
    this.function_table_index = stream.get_u2();
 }

-var Bc0File = function (filename) {
-    var file = getBytes(filename);
+var Bc0File = function (bytecode) {
+    var file = getBytes(bytecode);
+    this.line_numbers = getLineNumbers(bytecode);
    var stream = new byte_stream.ByteStream(file);
    
    var magic = stream.get_u4();
@@ -90,6 +100,7 @@ var Bc0File = function (filename) {
    this.function_pool = [];
    for (var i = 0; i < this.function_count; i++) {
        this.function_pool.push(new FunctionInfo(stream));
+        this.function_pool[i].function_id = i;
    }

    this.native_count = stream.get_u2();
@@ -108,9 +119,50 @@ Bc0File.prototype.string_from_index = function (i) {
    return result;
 }

-function parse(filename) {
-    return new Bc0File(filename);
+Bc0File.prototype.line_for_indices = function(function_index, byte_offset) {
+    var offset_in_file = this.function_pool[function_index].code_byte_offset + 
+        byte_offset;
+    return this.line_numbers[offset_in_file];
+}
+
+Bc0File.prototype.indicies_for_line = function(line) {
+    // Performs a linear search through the (bytecode to line number) map
+    // to find the bytecode offsets corresponding to a line number
+    var function_index = 0;
+    while (function_index < this.function_pool.length - 1) {
+        var function_start = this.function_pool[function_index + 1].code_byte_offset;
+        if (this.line_numbers[function_start] > line) break;
+        function_start++;
+    }
+
+    // function_index should now be set to the index of the function containing our line
+    var f = this.function_pool[function_index];
+    var offset = 0;
+    while (offset < f.code.length - 1) {
+        if (this.line_numbers[f.code_byte_offset + offset] > line) break;
+        offset++;
+    }
+    return [function_index, offset];
+}
+
+function parse(bytecode) {
+    return new Bc0File(bytecode);
+}
+
+function parseFile(filename) {
+    var data = fs.readFileSync(filename);
+    
+    if (data == null) {
+        if (err["code"] === "ENOENT")
+            console.log("Error: file " + filename + " does not exist.");
+        else
+            console.log("Error: " + err);
+        return;
+    }
+
+    return parse(data);
 }

 exports.getBytes = getBytes;
 exports.parse = parse;
+exports.parseFile = parseFile;
--- a/public/vm/c0ffi.js
+++ b/public/vm/c0ffi.js
@@ -108,3 +108,46 @@ exports.NATIVE_STRING_TERMINATED = 92
 exports.NATIVE_STRING_TO_CHARARRAY = 93
 exports.NATIVE_STRING_TOLOWER = 94

+callbacks = {};
+callbacks[exports.NATIVE_STRING_LENGTH] =
+    function(args) {
+        return args[0].length;
+    };
+
+callbacks[exports.NATIVE_STRING_TO_CHARARRAY] =
+    function(args, vm) {
+        var address = vm.heap.length;
+        vm.heap.push(args[0].length+1);
+        vm.heap.push(1);
+        for (var i = 0; i < args[0].length; i++) {
+            vm.heap.push(args[0][i]);
+        }
+        vm.heap.push(0);
+        return address;
+    };
+
+
+callbacks[exports.NATIVE_STRING_FROM_CHARARRAY] =
+    function(args, vm) {
+        var i = args[0] + 2;
+        var result = "";
+        while (vm.heap[i] !== 0) {
+            result += vm.heap[i];
+            i++;
+        }
+        return result;
+    };
+
+callbacks[exports.NATIVE_CHAR_CHR] =
+    function(args) {
+        return String.fromCharCode(args[0]);
+    };
+
+callbacks[exports.NATIVE_CHAR_ORD] =
+    function(args) {
+        if (typeof args[0] == "string")
+            return args[0].charCodeAt(0);
+        return args[0];
+    };
+
+exports.default_callbacks = callbacks;
--- a/public/vm/c0vm.js
+++ b/public/vm/c0vm.js
@@ -28,7 +28,6 @@ function i32_to_array(i32) {
            ((i32 >> 8) & 0xFF),
            ((i32 >> 16) & 0xFF),
            ((i32 >> 24) & 0xFF)];
-            
 }

 function array_to_i32(array) {
@@ -43,6 +42,7 @@ var StackFrame = function(file, f) {
    this.stack = [];
    this.pc = 0;
    this.program = f.code;
+    this.function_id = f.function_id;
    this.variables = [];
    for (var i = 0; i < f.num_vars; i++)
        this.variables.push(0);
@@ -63,13 +63,15 @@ var ProgramState = function(parsed_file, callback_dict) {
        try {
            this.natives[i] = callback_dict[i];
        } catch (key_not_found) {
-            this.natives[i] = function (arg) { 
+            this.natives[i] = function (arg) {
                console.log("Native function " + name + " called, ran method stub.");
                return 0;
            };
        }
    }
-    
+
+    this.breakpoints = [];
+
    // Memory is just a big array of bytes, right?
    // "Allocation" is appending onto this array
    // A pointer to memory is an index into this array.
@@ -113,9 +115,10 @@ ProgramState.prototype.doIf = function(f) {
 }

 ProgramState.prototype.step = function() {
+    this.maintain_line_numbers();
    var opcode = this.frame.program[this.frame.pc]
    log("0x" + this.frame.pc.toString(16) + " Running opcode " +
-        op.lookup_table[opcode]);
+        op.lookup_table[opcode] + " at line " + this.bytecode_line);
    switch (opcode) {
        // Stack manipulation
    case op.POP:
@@ -138,7 +141,7 @@ ProgramState.prototype.step = function() {
    case op.BIPUSH:
        this.frame.pc += 2;
        var val = this.frame.program[this.frame.pc-1];
-        
+
        // Do sign extension if necessary
        if ((val & 0x80) != 0)
            val = -0x80 + (val & 0x7F);
@@ -340,9 +343,9 @@ ProgramState.prototype.step = function() {
            };
            console.log("Unknown native function index " + f.function_table_index);
        }
-        log("Calling native function with index " + index + " with arguments " + 
+        log("Calling native function with index " + index + " with arguments " +
            arg_array);
-        this.push(native_function(arg_array));
+        this.push(native_function(arg_array, this));
        break;

        // Memory allocation operations:
@@ -352,7 +355,7 @@ ProgramState.prototype.step = function() {
        var address = this.heap.length;

        for (var i = 0; i < size; i++) this.heap.push(0);
-        
+
        this.push(address);
        this.frame.pc += 2;
        break;
@@ -365,7 +368,7 @@ ProgramState.prototype.step = function() {

        this.heap.push(num_elements);
        this.heap.push(size);
-        
+
        for (var i = 0; i < num_elements; i++) {
            for (var j = 0; j < size; j++)
                this.heap.push(0);
@@ -471,8 +474,89 @@ ProgramState.prototype.step = function() {
    }
 }

-// Takes in a parsed .bc0 file and runs it
-function execute(file, callbacks, v) {
+ProgramState.prototype.maintain_line_numbers = function() {
+    this.bytecode_line = this.file.line_for_indices(this.frame.function_id,
+                                                    this.frame.pc);
+    // this.c0_line = SOMEHOW GET THE LINE IN THE c0 FILE
+}
+
+ProgramState.prototype.remove_breakpoint = function(opcode_index) {
+    if (opcode_index < 0){
+        console.log("Error: negative opcode_index" + opcode_index.toString());
+        throw "Error - negative opcode index";
+    }
+    else if (opcode_index >= this.frame.program.length) {
+        console.log("Error: opcode index larger than max index:"
+                    + opcode_index.toString());
+        throw "Error - opcode index too large";
+    }
+    for (i = 0; i < this.breakpoints.length; i++) {
+        if (this.breakpoints[i][1] == opcode_index){
+            var index = i;
+            array.splice(index,1);
+            return;
+        }
+    }
+    console.log("Error: non-breakpoint opcode index" + opcode_index.toString());
+    throw "Error - non-breakpoint opcode index";
+}
+
+ProgramState.prototype.set_breakpoint = function(function_index, opcode_index) {
+    if (opcode_index < 0) {
+        console.log("Error: negative opcode_index" + opcode_index.toString());
+        throw "Error - negative opcode index";
+    }
+    else if (opcode_index >= this.frame.program.length) {
+        console.log("Error: opcode index larger than max index:"
+                    + opcode_index.toString());
+        throw "Error - opcode index too large";
+    }
+    this.breakpoints.push([function_index, opcode_index]);
+}
+
+ProgramState.prototype.set_breakpoint_bytecode_line = function(line) {
+    var indicies = this.file.indicies_for_line(line);
+    if (indicies === null || indicies.length < 2) {
+        console.log("Error - indicies_for_line returned an invalid result.");
+    }
+    this.set_breakpoint(indicies[0], indicies[1]);
+}
+
+ProgramState.prototype.run = function() {
+    while (true) {
+        for (var i = 0; i < this.breakpoints.length; i++) {
+            var breakpoint = this.breakpoints[i];
+            
+            if (this.frame.function_id == breakpoint[0] &&
+                this.frame.pc == breakpoint[1] &&
+                this.stopped_at !== breakpoint) {
+                log("Breakpoint reached!");
+                this.stopped_at = breakpoint;
+
+                this.maintain_line_numbers();
+
+                return this;
+            }
+        }
+
+        this.stopped_at = undefined;
+        
+        var val = this.step();
+        if (val !== undefined) return val;
+
+        if (verbose) {
+            console.log("Machine this:");
+            console.log("  Current Stack Frame:");
+            console.log("    Stack: " + this.frame.stack);
+            console.log("    PC:    " + this.frame.pc);
+            console.log("    Vars:  " + this.frame.variables);
+            // console.log("    Code:  " + this.frame.program);
+            console.log("  Heap: " + this.heap);
+        }
+    }
+}
+
+function initialize_vm(file, callbacks, v) {
    verbose = typeof v !== 'undefined' ? v : true;
    log("Initializing with file " + file);

@@ -481,26 +565,15 @@ function execute(file, callbacks, v) {
    if (verbose) log(file);

    log("Beginning execution");
-    
-    while (true) {
-        var val = state.step();
-        if (val !== undefined) return val;

-        if (verbose) {
-            console.log("Machine state:");
-            console.log("  Current Stack Frame:");
-            console.log("    Stack: " + state.frame.stack);
-            console.log("    PC:    " + state.frame.pc);
-            console.log("    Vars:  " + state.frame.variables);
-            // console.log("    Code:  " + state.frame.program);
-            console.log("  Heap: " + state.heap);
-        }
+    return state;
+}

-        // if (at_breakpoint) {
-        //   save state (maybe in a global in this file?)
-        //   return;
-        // }
-    }        
+// Takes in a parsed .bc0 file and runs it
+function execute(file, callbacks, v) {
+    var state = initialize_vm(file, callbacks, v);
+    return state.run();
 }

 exports.execute = execute;
+exports.initialize_vm = initialize_vm;
--- a/public/vm/cc0.cgi
+++ b/public/vm/cc0.cgi
--- a/public/vm/index.js
+++ b/public/vm/index.js
@@ -16,7 +16,7 @@ function print(arg) {
  $("#output").append(arg);
 }

-callbacks = {};
+callbacks = c0ffi.default_callbacks;
 callbacks[c0ffi.NATIVE_PRINT] = function(args) {
  print(args[0]);
  print("<br />");
@@ -33,6 +33,9 @@ console.log(callbacks);

 $("#run").click(function() {
  var input = $("#bytecode").html().replace(/(\r\n|\n|\r)/gm,"");
+
+  $("#output").text("");
+  
  var file = parser.parse($("#bytecode").text());
  print("<br />");
  print(c0vm.execute(file, callbacks));
--- a/public/vm/vm.js
+++ b/public/vm/vm.js
@@ -131,6 +131,7 @@ var Bc0File = function (filename) {
    this.function_pool = [];
    for (var i = 0; i < this.function_count; i++) {
        this.function_pool.push(new FunctionInfo(stream));
+        this.function_pool[i].function_id = i;
    }

    this.native_count = stream.get_u2();
@@ -267,6 +268,49 @@ exports.NATIVE_STRING_TERMINATED = 92
 exports.NATIVE_STRING_TO_CHARARRAY = 93
 exports.NATIVE_STRING_TOLOWER = 94

+callbacks = {};
+callbacks[exports.NATIVE_STRING_LENGTH] =
+    function(args) {
+        return args[0].length;
+    };
+
+callbacks[exports.NATIVE_STRING_TO_CHARARRAY] =
+    function(args, vm) {
+        var address = vm.heap.length;
+        vm.heap.push(args[0].length+1);
+        vm.heap.push(1);
+        for (var i = 0; i < args[0].length; i++) {
+            vm.heap.push(args[0][i]);
+        }
+        vm.heap.push(0);
+        return address;
+    };
+
+
+callbacks[exports.NATIVE_STRING_FROM_CHARARRAY] =
+    function(args, vm) {
+        var i = args[0] + 2;
+        var result = "";
+        while (vm.heap[i] !== 0) {
+            result += vm.heap[i];
+            i++;
+        }
+        return result;
+    };
+
+callbacks[exports.NATIVE_CHAR_CHR] =
+    function(args) {
+        return String.fromCharCode(args[0]);
+    };
+
+callbacks[exports.NATIVE_CHAR_ORD] =
+    function(args) {
+        if (typeof args[0] == "string")
+            return args[0].charCodeAt(0);
+        return args[0];
+    };
+
+exports.default_callbacks = callbacks;

 },{}],4:[function(require,module,exports){
 op = require("./opcodes");
@@ -299,7 +343,6 @@ function i32_to_array(i32) {
            ((i32 >> 8) & 0xFF),
            ((i32 >> 16) & 0xFF),
            ((i32 >> 24) & 0xFF)];
-            
 }

 function array_to_i32(array) {
@@ -314,6 +357,7 @@ var StackFrame = function(file, f) {
    this.stack = [];
    this.pc = 0;
    this.program = f.code;
+    this.function_id = f.function_id;
    this.variables = [];
    for (var i = 0; i < f.num_vars; i++)
        this.variables.push(0);
@@ -334,13 +378,15 @@ var ProgramState = function(parsed_file, callback_dict) {
        try {
            this.natives[i] = callback_dict[i];
        } catch (key_not_found) {
-            this.natives[i] = function (arg) { 
+            this.natives[i] = function (arg) {
                console.log("Native function " + name + " called, ran method stub.");
                return 0;
            };
        }
    }
-    
+
+    this.breakpoints = [];
+
    // Memory is just a big array of bytes, right?
    // "Allocation" is appending onto this array
    // A pointer to memory is an index into this array.
@@ -409,7 +455,7 @@ ProgramState.prototype.step = function() {
    case op.BIPUSH:
        this.frame.pc += 2;
        var val = this.frame.program[this.frame.pc-1];
-        
+
        // Do sign extension if necessary
        if ((val & 0x80) != 0)
            val = -0x80 + (val & 0x7F);
@@ -611,9 +657,9 @@ ProgramState.prototype.step = function() {
            };
            console.log("Unknown native function index " + f.function_table_index);
        }
-        log("Calling native function with index " + index + " with arguments " + 
+        log("Calling native function with index " + index + " with arguments " +
            arg_array);
-        this.push(native_function(arg_array));
+        this.push(native_function(arg_array, this));
        break;

        // Memory allocation operations:
@@ -623,7 +669,7 @@ ProgramState.prototype.step = function() {
        var address = this.heap.length;

        for (var i = 0; i < size; i++) this.heap.push(0);
-        
+
        this.push(address);
        this.frame.pc += 2;
        break;
@@ -636,7 +682,7 @@ ProgramState.prototype.step = function() {

        this.heap.push(num_elements);
        this.heap.push(size);
-        
+
        for (var i = 0; i < num_elements; i++) {
            for (var j = 0; j < size; j++)
                this.heap.push(0);
@@ -742,8 +788,11 @@ ProgramState.prototype.step = function() {
    }
 }

-// Takes in a parsed .bc0 file and runs it
-function execute(file, callbacks, v) {
+ProgramState.prototype.set_breakpoint = function(function_index, opcode_index) {
+    this.breakpoints.push([function_index, opcode_index]);
+}
+
+function initialize_vm(file, callbacks, v) {
    verbose = typeof v !== 'undefined' ? v : true;
    log("Initializing with file " + file);

@@ -752,29 +801,48 @@ function execute(file, callbacks, v) {
    if (verbose) log(file);

    log("Beginning execution");
-    
+
+    return state;
+}
+
+function run_vm(vm) {
    while (true) {
-        var val = state.step();
+        for (breakpoint in vm.breakpoints) {
+            if (vm.frame.function_id == breakpoint[0] &&
+                vm.frame.pc == breakpoint[1]) {
+                console.log("Breakpoint reached!");
+                return vm;
+            }
+        }
+        
+        var val = vm.step();
        if (val !== undefined) return val;

        if (verbose) {
-            console.log("Machine state:");
+            console.log("Machine vm:");
            console.log("  Current Stack Frame:");
-            console.log("    Stack: " + state.frame.stack);
-            console.log("    PC:    " + state.frame.pc);
-            console.log("    Vars:  " + state.frame.variables);
-            // console.log("    Code:  " + state.frame.program);
-            console.log("  Heap: " + state.heap);
+            console.log("    Stack: " + vm.frame.stack);
+            console.log("    PC:    " + vm.frame.pc);
+            console.log("    Vars:  " + vm.frame.variables);
+            // console.log("    Code:  " + vm.frame.program);
+            console.log("  Heap: " + vm.heap);
        }
+    }
+}

        // if (at_breakpoint) {
        //   save state (maybe in a global in this file?)
        //   return;
        // }
-    }        
+// Takes in a parsed .bc0 file and runs it
+function execute(file, callbacks, v) {
+    var state = initialize_vm(file, callbacks, v);
+    return run_vm(state);
 }

 exports.execute = execute;
+exports.initialize_vm = initialize_vm;
+exports.run_vm = run_vm;

 },{"./opcodes":6}],5:[function(require,module,exports){
 parser = require("./bytecode-parser");
@@ -795,7 +863,7 @@ function print(arg) {
  $("#output").append(arg);
 }

-callbacks = {};
+callbacks = c0ffi.default_callbacks;
 callbacks[c0ffi.NATIVE_PRINT] = function(args) {
  print(args[0]);
  print("<br />");
@@ -812,6 +880,9 @@ console.log(callbacks);

 $("#run").click(function() {
  var input = $("#bytecode").html().replace(/(\r\n|\n|\r)/gm,"");
+
+  $("#output").text("");
+  
  var file = parser.parse($("#bytecode").text());
  print("<br />");
  print(c0vm.execute(file, callbacks));
@@ -926,4 +997,4 @@ exports.lookup_table = {

 },{}],7:[function(require,module,exports){

-},{}]},{},[4,2,1,6,5]);
+},{}]},{},[4,2,1,6,3,5]);
--- a/src/c0ffi.js
+++ b/src/c0ffi.js
@@ -1,110 +0,0 @@
-exports.NATIVE_FADD = 0
-exports.NATIVE_FDIV = 1
-exports.NATIVE_FLESS = 2
-exports.NATIVE_FMUL = 3
-exports.NATIVE_FSUB = 4
-exports.NATIVE_FTOI = 5
-exports.NATIVE_ITOF = 6
-exports.NATIVE_PRINT_FPT = 7
-exports.NATIVE_PRINT_HEX = 8
-exports.NATIVE_PRINT_INT = 9
-
-/* args */
-exports.NATIVE_ARGS_FLAG = 10
-exports.NATIVE_ARGS_INT = 11
-exports.NATIVE_ARGS_PARSE = 12
-exports.NATIVE_ARGS_STRING = 13
-
-/* conio */
-exports.NATIVE_EOF = 14
-exports.NATIVE_FLUSH = 15
-exports.NATIVE_PRINT = 16
-exports.NATIVE_PRINTBOOL = 17
-exports.NATIVE_PRINTCHAR = 18
-exports.NATIVE_PRINTINT = 19
-exports.NATIVE_PRINTLN = 20
-exports.NATIVE_READLINE = 21
-
-/* curses */
-exports.NATIVE_C_ADDCH = 22
-exports.NATIVE_C_CBREAK = 23
-exports.NATIVE_C_CURS_SET = 24
-exports.NATIVE_C_DELCH = 25
-exports.NATIVE_C_ENDWIN = 26
-exports.NATIVE_C_ERASE = 27
-exports.NATIVE_C_GETCH = 28
-exports.NATIVE_C_INITSCR = 29
-exports.NATIVE_C_KEYPAD = 30
-exports.NATIVE_C_MOVE = 31
-exports.NATIVE_C_NOECHO = 32
-exports.NATIVE_C_REFRESH = 33
-exports.NATIVE_C_SUBWIN = 34
-exports.NATIVE_C_WADDCH = 35
-exports.NATIVE_C_WADDSTR = 36
-exports.NATIVE_C_WCLEAR = 37
-exports.NATIVE_C_WERASE = 38
-exports.NATIVE_C_WMOVE = 39
-exports.NATIVE_C_WREFRESH = 40
-exports.NATIVE_C_WSTANDEND = 41
-exports.NATIVE_C_WSTANDOUT = 42
-exports.NATIVE_CC_GETBEGX = 43
-exports.NATIVE_CC_GETBEGY = 44
-exports.NATIVE_CC_GETMAXX = 45
-exports.NATIVE_CC_GETMAXY = 46
-exports.NATIVE_CC_GETX = 47
-exports.NATIVE_CC_GETY = 48
-exports.NATIVE_CC_HIGHLIGHT = 49
-exports.NATIVE_CC_KEY_IS_BACKSPACE = 50
-exports.NATIVE_CC_KEY_IS_DOWN = 51
-exports.NATIVE_CC_KEY_IS_ENTER = 52
-exports.NATIVE_CC_KEY_IS_LEFT = 53
-exports.NATIVE_CC_KEY_IS_RIGHT = 54
-exports.NATIVE_CC_KEY_IS_UP = 55
-exports.NATIVE_CC_WBOLDOFF = 56
-exports.NATIVE_CC_WBOLDON = 57
-exports.NATIVE_CC_WDIMOFF = 58
-exports.NATIVE_CC_WDIMON = 59
-exports.NATIVE_CC_WREVERSEOFF = 60
-exports.NATIVE_CC_WREVERSEON = 61
-exports.NATIVE_CC_WUNDEROFF = 62
-exports.NATIVE_CC_WUNDERON = 63
-
-/* file */
-exports.NATIVE_FILE_CLOSE = 64
-exports.NATIVE_FILE_CLOSED = 65
-exports.NATIVE_FILE_EOF = 66
-exports.NATIVE_FILE_READ = 67
-exports.NATIVE_FILE_READLINE = 68
-
-/* img */
-exports.NATIVE_IMAGE_CLONE = 69
-exports.NATIVE_IMAGE_CREATE = 70
-exports.NATIVE_IMAGE_DATA = 71
-exports.NATIVE_IMAGE_DESTROY = 72
-exports.NATIVE_IMAGE_HEIGHT = 73
-exports.NATIVE_IMAGE_LOAD = 74
-exports.NATIVE_IMAGE_SAVE = 75
-exports.NATIVE_IMAGE_SUBIMAGE = 76
-exports.NATIVE_IMAGE_WIDTH = 77
-
-/* parse */
-exports.NATIVE_PARSE_BOOL = 78
-exports.NATIVE_PARSE_INT = 79
-
-/* string */
-exports.NATIVE_CHAR_CHR = 80
-exports.NATIVE_CHAR_ORD = 81
-exports.NATIVE_STRING_CHARAT = 82
-exports.NATIVE_STRING_COMPARE = 83
-exports.NATIVE_STRING_EQUAL = 84
-exports.NATIVE_STRING_FROM_CHARARRAY = 85
-exports.NATIVE_STRING_FROMBOOL = 86
-exports.NATIVE_STRING_FROMCHAR = 87
-exports.NATIVE_STRING_FROMINT = 88
-exports.NATIVE_STRING_JOIN = 89
-exports.NATIVE_STRING_LENGTH = 90
-exports.NATIVE_STRING_SUB = 91
-exports.NATIVE_STRING_TERMINATED = 92
-exports.NATIVE_STRING_TO_CHARARRAY = 93
-exports.NATIVE_STRING_TOLOWER = 94
-
--- a/test/abort.c0.ex
+++ b/test/abort.c0.ex
--- a/test/arith.c0.ex
+++ b/test/arith.c0.ex
--- a/test/arrays.c0.ex
+++ b/test/arrays.c0.ex
--- a/test/dsquared.c0.ex
+++ b/test/dsquared.c0.ex
--- a/test/easyMath.c0.ex
+++ b/test/easyMath.c0.ex
--- a/test/hellosir.c0.ex
+++ b/test/hellosir.c0.ex
--- a/test/iadd.c0
+++ b/test/iadd.c0
--- a/test/iadd.c0.bc0
+++ b/test/iadd.c0.bc0
--- a/test/iadd.c0.ex
+++ b/test/iadd.c0.ex
--- a/test/ishr.c0.ex
+++ b/test/ishr.c0.ex
--- a/test/isqrt.c0.ex
+++ b/test/isqrt.c0.ex
--- a/test/mid.c0.ex
+++ b/test/mid.c0.ex
--- a/test/moreArrays.c0.ex
+++ b/test/moreArrays.c0.ex
--- a/test/piazza1.c0.ex
+++ b/test/piazza1.c0.ex
--- a/test/sample2.5.c0.ex
+++ b/test/sample2.5.c0.ex
--- a/test/strings.c0.ex
+++ b/test/strings.c0.ex
--- a/test/structs.c0.ex
+++ b/test/structs.c0.ex
--- a/test/testError.c0.ex
+++ b/test/testError.c0.ex
--- a/test/testif.c0.ex
+++ b/test/testif.c0.ex
--- a/test/tests.js
+++ b/test/tests.js
@@ -1,8 +1,9 @@
-parser = require("../src/bytecode-parser.js");
-c0vm = require("../src/c0vm.js");
-c0ffi = require("../src/c0ffi.js");
+parser = require("../public/vm/bytecode-parser.js");
+c0vm = require("../public/vm/c0vm.js");
+c0ffi = require("../public/vm/c0ffi.js");

-var callbacks = {}
+var callbacks = c0ffi.default_callbacks;
+console.log("Initial callbacks: " + callbacks[c0ffi.NATIVE_STRING_LENGTH](["hi"]));
 var printout = "";

 callbacks[c0ffi.NATIVE_PRINT] = function(args) {
@@ -20,33 +21,9 @@ callbacks[c0ffi.NATIVE_PRINTLN] = function(args) {
    return 0;
 }

-callbacks[c0ffi.NATIVE_STRING_LENGTH] = function(args) {
-    return args[0].length;
-}
-
-callbacks[c0ffi.NATIVE_STRING_TO_CHARARRAY] = function(args) {
-    return args[0];
-}
-
-callbacks[c0ffi.NATIVE_STRING_FROM_CHARARRAY] = function(args) {
-    console.log("string_from_chararray: " + args);
-    return args[0];
-}
-
-callbacks[c0ffi.NATIVE_CHAR_CHR] = function(args) {
-    return String.fromCharCode(args[0]);
-}
-
-callbacks[c0ffi.NATIVE_CHAR_ORD] = function(args) {
-    console.log("native_car_ord: " + args);
-    if (typeof args[0] == "string")
-        return args[0].charCodeAt(0);
-    return args[0];
-}
-
 function doTest(filename, expected_result) {
    return function(test) {
-        var result = c0vm.execute(parser.parse(filename), callbacks, false);
+        var result = c0vm.execute(parser.parseFile(filename), callbacks, false);
        test.ok(result == expected_result,
                filename + " - did not get expected result " + expected_result +
               ", instead got " + result);
@@ -58,7 +35,7 @@ exports.testIADD = doTest("iadd.c0.bc0", -2);

 exports.testPrint = function(test) {
    printout = "";
-    var result = c0vm.execute(parser.parse("test.bc0"), callbacks, false);
+    var result = c0vm.execute(parser.parseFile("test.bc0"), callbacks, false);
    test.ok(printout == "Hello, world.\nYou don't look so good.\n",
            "test.bc0 - Did not print to screen correctly: output was " + printout);
    test.done();
@@ -73,7 +50,7 @@ exports.testMID = doTest("mid.c0.bc0", 155);
 // This one should throw an exception because an assertion fails
 exports.testSample25 = function(test) {
    test.throws(function () {
-        c0vm.execute(parser.parse("sample2.5.c0.bc0"), callbacks, false)
+        c0vm.execute(parser.parseFile("sample2.5.c0.bc0"), callbacks, false)
    });
    test.done();
 }
@@ -84,14 +61,14 @@ exports.testDSQUARED = doTest("dsquared.c0.bc0", 17068);
    
 exports.testArrays = function(test) {
    test.throws(function () {
-        c0vm.execute(parser.parse("arrays.c0.bc0"), callbacks, false)
+        c0vm.execute(parser.parseFile("arrays.c0.bc0"), callbacks, false)
    });
    test.done();
 }

 exports.testMoreArray = function(test) {
    printout = "";
-    var result = c0vm.execute(parser.parse("moreArrays.c0.bc0"), callbacks, false);
+    var result = c0vm.execute(parser.parseFile("moreArrays.c0.bc0"), callbacks, false);
    test.ok(printout == "2312",
            "moreArrays.c0.bc0 - Did not print to screen correctly, result was " + 
            printout);
@@ -100,7 +77,7 @@ exports.testMoreArray = function(test) {

 exports.testStructs = function(test) {
    printout = "";
-    var result = c0vm.execute(parser.parse("structs.c0.bc0"), callbacks, false);
+    var result = c0vm.execute(parser.parseFile("structs.c0.bc0"), callbacks, false);
    test.ok(printout == "potato chip123",
            "structs.c0.bc0 - Did not print to screen correctly, result was " + 
            printout);
@@ -109,14 +86,14 @@ exports.testStructs = function(test) {

 exports.testAbort = function(test) {
    test.throws(function () {
-        c0vm.execute(parser.parse("abort.c0.bc0"), callbacks, false);
+        c0vm.execute(parser.parseFile("abort.c0.bc0"), callbacks, false);
    });
    test.done();
 }

 exports.testArith = function(test) {
    printout = "";
-    var result = c0vm.execute(parser.parse("arith.c0.bc0"), callbacks, false);
+    var result = c0vm.execute(parser.parseFile("arith.c0.bc0"), callbacks, false);
    test.ok(printout == "-2147483648   2147483647   -375   -2147483648   -9   -1   12   \n-12   12   Modulus testing   11-1   5   1   Testing constants   -251   Testing inequalities   \ny1  y2  y3  n4  n5  n6  y7  Testing bitwise operators   \n992000   1045310   53250   -12083   Testing bit shifting\n-2147483648   7360588088-31-19\n",
            "arith.c0.bc0 - Did not print to screen correctly, result was " + 
            printout);
@@ -127,9 +104,29 @@ exports.testPIAZZA1 = doTest("piazza1.c0.bc0", 18);

 exports.testSTRINGS = function(test) {
    printout = "";
-    var result = c0vm.execute(parser.parse("strings.c0.bc0"), callbacks, false);
+    var result = c0vm.execute(parser.parseFile("strings.c0.bc0"), callbacks, false);
    test.ok(printout == "hello there!?",
            "strings.c0.bc0 - Did not print to screen correctly, result was " + 
            printout);
    test.done();
 }
+
+exports.testBREAKPOINT1 = function(test) {
+    var vm = c0vm.initialize_vm(parser.parseFile("easyMath.c0.bc0"),
+                                callbacks, false);
+    vm.set_breakpoint(0, 4);
+    var result = vm.run();
+    test.ok(result === vm,
+            "VM did not stop at breakpoint, instead returned " + result);
+    test.ok(vm.frame.stack[0] == 23 &&
+            vm.frame.stack[1] == 19,
+            "VM stack incorrect");
+
+    test.ok(vm.bytecode_line == 19,
+            "VM reports incorrect line in bytecode: " + vm.bytecode_line);
+    
+    result = vm.run();
+    test.ok(result == 1748,
+            "VM did not resume operation correctly, gave result " + result);
+    test.done();
+}
--- a/views/index.jade
+++ b/views/index.jade
@@ -47,15 +47,14 @@ block script

    function compile() {
      var code = encodeURIComponent($("#inputCode").val());
-
      $.ajax({
              type: "POST",
              async: true,
              url: "http://www.contrib.andrew.cmu.edu/~amgutier/cc0.cgi",
-              dataType: "jsonp",
+              dataType: "json",
              data: {
                data: code
              },
-              jsonpCallback: "callback"
+              success: callback
      });
    }
Author	SHA1	Message	Date
Mitchell Plamann	5e0529a1e0	Started working on better breakpoints	2015-05-03 16:37:15 -04:00
Mitchell Plamann	44f10cb5c6	Correct bytecode line numbers reported when breakpoints are reached	2015-04-22 21:02:36 -04:00
Mitchell Plamann	d035346d2b	Breakpoints behave better now	2015-04-22 20:26:29 -04:00
Mitchell Plamann	5bee4d90c5	Updated tests to work with new parser changes	2015-04-22 20:07:31 -04:00
Suhaas Reddy	c742d5ed74	modded brk insertion and created brk removal modified breakpoint insertion and created interface for breakpoint removal	2015-04-22 00:04:46 -04:00
Aaron Gutierrez	609b6e17d4	Merge branch 'post'	2015-04-21 17:37:06 -04:00
Aaron Gutierrez	81a08cb9f8	Switched to POST request	2015-04-21 17:36:40 -04:00
Aaron Gutierrez	f4b3c06f79	wrong branch :(	2015-04-21 17:22:54 -04:00
Aaron Gutierrez	88b006cbcc	working cc0.cgi, starting transition to POST request	2015-04-20 22:20:20 -04:00
Aaron Gutierrez	ddf1d00f1b	Merge branch 'mplamann' Conflicts: public/vm/c0vm.js	2015-04-20 22:17:59 -04:00
Aaron Gutierrez	739005289e	changed because Mitchell broke things	2015-04-20 22:08:07 -04:00
Shyam Raghavan	62d0e37984	Merge branch 'shyam_raghavan' of github.com:aarongut/cdb into shyam_raghavan Conflicts: progress_report/progress_report.dvi progress_report/progress_report.fdb_latexmk progress_report/progress_report.fls progress_report/progress_report.out progress_report/progress_report.pdf progress_report/progress_report.tex progress_report/progress_report.tex.project.vim progress_report/progress_report_aux	2015-04-20 20:36:50 -04:00
Shyam Raghavan	d0540da465	Progress Report done	2015-04-20 20:36:14 -04:00
Mitchell Plamann	349fd6ff78	Start of a breakpoints system	2015-04-19 19:48:45 -04:00
Mitchell Plamann	6138821c3a	Moved non-IO callbacks to c0ffi.js	2015-04-19 19:18:49 -04:00
Mitchell Plamann	d39df5314d	Fixed strings	2015-04-19 19:11:20 -04:00
Shyam Raghavan	e870cd5cf9	WIP - Progress Report	2015-04-14 20:38:05 -04:00
Shyam Raghavan	d18ccb49da	Progress Report - in progress	2015-04-14 20:32:35 -04:00
Shyam Raghavan	ff581d8a8c	Progress Report - in progress	2015-04-14 16:51:47 -04:00
Aaron Gutierrez	d203261c64	Progress report progress section woo!	2015-04-14 16:45:34 -04:00
Aaron Gutierrez	6e3a9b87b9	Merge branch 'run_vm' Adds basic support for running c0 in browser	2015-04-13 23:16:06 -04:00
Mitchell Plamann	e029efcbd7	Added literature review first draft for the progress report	2015-04-13 18:55:01 -04:00