Merge branch 'master' of ssh://vo20.nl/home/git/repos/uva

portfolio/tracing/Makefile

@@ -19,8 +19,8 @@ highlight: basic-example.tex
 	$(MAKE) -C code
 
 %.pdf: %.tex
-	pdflatex $^
-	pdflatex $^
+	pdflatex -interaction=nonstopmode -halt-on-error $^
+	pdflatex -interaction=nonstopmode -halt-on-error $^
 	rm -vf *.log
 
 basic-example.tex: code/basic-example.js

portfolio/tracing/code/cfg-example.js

 function A(x) {
-    y = 0;                   // 1
+    var y = 0;               // 1
     do {                     // 2
         if( x > 42 ) {
             if( y > 1000 ) { // 3

portfolio/tracing/presentation.tex

@@ -2,7 +2,7 @@
 \usepackage[dutch]{babel}
 \usepackage[utf8]{inputenc}
 \usepackage{beamerthemesplit}
-\usepackage{graphics,booktabs,url,float}
+\usepackage{graphics,booktabs,hyperref,float}
 
 \definecolor{kugreen}{RGB}{110,131,163}
 \setbeamercovered{transparent}
@@ -11,10 +11,10 @@
 \defbeamertemplate*{footline}{compactlines theme} {
   \leavevmode%
   \hbox{%
-    \begin{beamercolorbox}[wd=.400000\paperwidth,ht=2.25ex,dp=1ex,center]{author in head/foot}%
+    \begin{beamercolorbox}[wd=.450000\paperwidth,ht=2.25ex,dp=1ex,center]{author in head/foot}%
       \usebeamerfont{author in head/foot}\insertshortauthor~~(\insertshortinstitute)
     \end{beamercolorbox}%
-    \begin{beamercolorbox}[wd=.400000\paperwidth,ht=2.25ex,dp=1ex,center]{title in head/foot}%
+    \begin{beamercolorbox}[wd=.350000\paperwidth,ht=2.25ex,dp=1ex,center]{title in head/foot}%
       \usebeamerfont{title in head/foot}\insertshorttitle
     \end{beamercolorbox}%
     \begin{beamercolorbox}[wd=.200000\paperwidth,ht=2.25ex,dp=1ex,center]{date in head/foot}%
@@ -49,9 +49,9 @@
 
 \title{Incremental trace trees and JavaScript}
 \subtitle{Executing typeless, dynamic languages faster}
-\author{Sander van Veen}
+\author{Sander Mathijs van Veen}
 \institute{Universiteit van Amsterdam}
-\date{2 mei 2011}
+\date{9 mei 2011}
 
 \begin{document}
 
@@ -63,6 +63,32 @@
   \tableofcontents[pausesection]
 }
 
+\section{Inleiding}
+
+\subsection{Waarom deze paper?}
+
+\frame { \frametitle{Waarom deze paper?}
+
+  \textbf{Incremental Dynamic Code generation with Trace Trees},
+
+  door \textbf{Andreas Gal} (Mozilla) en \textbf{Michael Franz} (University of
+  California).
+
+  \vskip1em
+
+  Deze paper heb ik gekozen omdat:
+
+  \begin{itemize}
+  \item Vrijwel iedereen er dagelijks gebruik van maakt.
+  \item Zelf veel met JavaScript gedaan.
+  \item Dynamic languages worden gebruikt voor prototyping.
+  \item Browser wars -- \url{http://arewefastyet.com}
+  \item Dynamic compiled sneller of langzamer dan static compiled zijn.
+  \item Just-in-Time compilers nog complexer zijn dan static compilers.
+  \end{itemize}
+
+}
+
 \section{Introductie tot JavaScript}
 
 \subsection{Wat is JavaScript?}
@@ -176,9 +202,13 @@
 
 }
 
-\subsection{Trace trees}
+\section{Trace trees}
+
+\subsection{Hoe worden trace trees opgenomen?}
 
-\frame { \frametitle{Hoe worden traces opgenomen?}
+\frame { \frametitle{Traces opnemen en trace opnemen mislukt}
+
+  \textbf{Trace opnemen}
 
   \begin{enumerate}
   \item Detecteer start van een loop.
@@ -197,5 +227,49 @@
 
 }
 
+\subsection{Een trace tree uitbreiden}
+
+\frame { \frametitle{Eerdere trace tree uitbreiden met nieuw pad}
+
+  \emph{TODO}
+
+}
+
+\subsection{Code generation}
+
+\frame{ \frametitle{Een trace omzetten in machine code}
+
+  \emph{TODO}
+
+}
+
+\subsection{Toekomst van trace trees}
+
+\frame { \frametitle{Toekomst: Static single assignment en traces}
+
+  \emph{Hier komt voorbeeld van SSA.}
+
+  \vskip6em
+
+  \begin{itemize}
+  \item Zorgt voor meer/betere mogelijkheden tot optimalisaties:
+    \begin{itemize}
+    \item Constant propagation.
+    \item Dead code elimination.
+    \item Register allocation.
+    \end{itemize}
+  \item Static single assignment subproject (IonMonkey).
+  \end{itemize}
+
+}
+
+\section{Conclusie}
+
+\frame { \frametitle{Conclusie en benchmarks}
+
+  \emph{TODO}
+
+}
+
 \end{document}
 % vim: foldmethod=marker
\ No newline at end of file

statred/ass2/reconstruct.py

@@ -23,7 +23,6 @@ NR_COMPONENTS = 6
 DETAIL_NR = 10123
 DETAIL_D = 25
 
-
 # performs reconstruction
 def reconstruct(k, detail_nr):