From f27b19a531a61aa088d380174cc960b9f2e68237 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Tue, 20 Feb 2018 17:50:47 -0500
Subject: [PATCH] major work, own malloc, making things work

---
 include/clock.h          |   9 +-
 include/display.h        |   6 ++
 include/display_draw.h   |   6 ++
 include/heap.h           |  10 +-
 include/initrd.h         |  40 +++++++-
 include/lcd.h            |  50 +++++++++-
 include/serial.h         |  23 +++++
 include/task.h           |  15 +++
 initrd/init              |  39 ++++----
 libinterp.a              | Bin 63086 -> 61880 bytes
 run.sh                   |   8 +-
 src/display.c            |  56 ++++++++---
 src/display_draw.c       |  92 +++++++++++++++++-
 src/heap.c               |  82 ++++++++--------
 src/{lcd.c => lcd.c.bak} |   0
 src/main.c               |  95 ++++++++++++++----
 src/main.c.bak           | 203 +++++++++++++++++++++++++++++++++++++++
 src/serial.c             |   6 +-
 src/stm32l4xx_it.c       |   2 +-
 src/svc.c                |   2 +-
 src/task.c               |   2 +-
 21 files changed, 629 insertions(+), 117 deletions(-)
 rename src/{lcd.c => lcd.c.bak} (100%)
 create mode 100644 src/main.c.bak

diff --git a/include/clock.h b/include/clock.h
index 9d4b17a..77ab7e9 100644
--- a/include/clock.h
+++ b/include/clock.h
@@ -1,3 +1,8 @@
+/**
+ * @file clock.h
+ * Basic clock utilities
+ */
+
 #ifndef CLOCK_H_
 #define CLOCK_H_
 
@@ -5,11 +10,13 @@
 
 /**
  * Sets HCLK (system clock) to 80MHz, the maximum.
+ * @param none
  */
 extern void clock_init(void);
 
 /**
- * Sleeps for given milliseconds.
+ * Sleeps for given amount of milliseconds.
+ * @param ms number of milliseconds to sleep for
  */
 void delay(uint32_t ms);
 
diff --git a/include/display.h b/include/display.h
index fb808c6..6004f19 100644
--- a/include/display.h
+++ b/include/display.h
@@ -9,9 +9,15 @@
 #define COLOR_MAX 31
 
 uint16_t dsp_color(uint8_t r, uint8_t g, uint8_t b);
+
+void dsp_dmode(int mode);
 void dsp_write_cmd(uint8_t data);
 void dsp_write_data(uint8_t data);
+uint8_t dsp_read_data(void);
+
 void dsp_set_addr(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
+void dsp_set_addr_read(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2);
+
 void dsp_init(void);
 
 #endif // DISPLAY_H_
diff --git a/include/display_draw.h b/include/display_draw.h
index 1030d45..5ed4224 100644
--- a/include/display_draw.h
+++ b/include/display_draw.h
@@ -1,9 +1,15 @@
 #ifndef DISPLAY_DRAW_H_
 #define DISPLAY_DRAW_H_
 
+#include <stdint.h>
+
+void dsp_cursoron(void);
+
+void dsp_line(int x, int y, int i, int j, uint16_t color);
 void dsp_rect(int x, int y, int w, int h, uint16_t color);
 
 void dsp_cpos(int x, int y);
+void dsp_coff(int x, int y);
 void dsp_puts(const char *s);
 
 #endif // DISPLAY_DRAW_H_
diff --git a/include/heap.h b/include/heap.h
index 9625771..c93eb8e 100644
--- a/include/heap.h
+++ b/include/heap.h
@@ -1,12 +1,12 @@
 #ifndef HEAP_H_
 #define HEAP_H_
 
-//#include <stdint.h>
+#include <stdint.h>
 
-//uint32_t heap_available(void);
+void heap_init(void *buf);
 
-//void *malloc(uint32_t size);
-//void *calloc(uint32_t count, uint32_t size);
-//void free(void *buf);
+void *malloc(uint32_t size);
+void *calloc(uint32_t count, uint32_t size);
+void free(void *buf);
 
 #endif // HEAP_H_
diff --git a/include/initrd.h b/include/initrd.h
index 9c7a9de..de730f2 100644
--- a/include/initrd.h
+++ b/include/initrd.h
@@ -1,23 +1,53 @@
+/**
+ * @file initrd.h
+ * Initrd image support
+ * An archive file (made with ar) can be linked into the final executable to
+ * allow files to be loaded in memory on boot. See mkinitrd.sh or the Makefile
+ * for more info.
+ */
+
 #ifndef INITRD_H_
 #define INITRD_H_
 
 #include <stdint.h>
 
+/**
+ * Structure for the archive's header.
+ */
 typedef struct
 {
-	char signature[8];
+	char signature[8]; /**< The archive's signature. */
 } __attribute__ ((packed)) initrd_header;
 
+/**
+ * Structure for a file entry in the archive.
+ */
 typedef struct 
 {
-	char name[16];
-	uint8_t unused[32];
-	char size[10];
-	char sig[2];
+	char name[16];      /**< The name of the file. */
+	uint8_t unused[32]; /**< Unused information. */
+	char size[10];      /**< The file's size in bytes (as string). */
+	char sig[2];        /**< A signature to start file data. */
 } __attribute__ ((packed)) initrd_file;
 
+/**
+ * Confirms the initrd image is loaded and valid.
+ * @return non-zero if valid image found
+ */
 uint8_t initrd_validate(void);
+
+/**
+ * Gets contents of the given file.
+ * @param name the file's name
+ * @return pointer to file data, null if not found
+ */
 char *initrd_getfile(const char *name);
+
+/**
+ * Gets the size of the given file.
+ * @param name the file's name
+ * @return the file's size, in bytes
+ */
 uint32_t initrd_getfilesize(const char *name);
 
 #endif // INITRD_H_
diff --git a/include/lcd.h b/include/lcd.h
index 441d463..378aac4 100644
--- a/include/lcd.h
+++ b/include/lcd.h
@@ -1,23 +1,63 @@
+/**
+ * @file lcd.h
+ * A basic library for writing a 16x2 text LCD.
+ */
+
 #ifndef LCD_H_
 #define LCD_H_
 
 #include <stdint.h>
 
 /**
- * Direct access
+ * A handler/task to manage asyncronous LCD writes.
+ */
+void lcd_handler(void);
+
+/**
+ * Writes a string asyncronously to the LCD.
+ * The lcd_handler task must be running for the string to actually be printed.
+ * @param s the string to write
+ */
+void lcd_put(const char *s);
+
+//
+// The following functions do not support asyncronous calls.
+//
+
+/**
+ * Initializes the LCD.
  */
 void lcd_init(void);
 
+/**
+ * Writes a string to the LCD.
+ * A cursor position is kept internally. When the end of the screen is reached,
+ * writing resumes at the first position.
+ * @param s the string to write
+ */
 void lcd_puts(const char *s);
+
+/**
+ * Writes a base 10 integer to the screen.
+ * @param i the integer to print
+ */
 void lcd_puti(int i);
+
+/**
+ * Writes a base 16 integer to the screen.
+ * @param h the integer to print
+ */
 void lcd_puth(int h);
+
+/**
+ * Writes a byte in binary to the screen.
+ * @param b the byte to print
+ */
 void lcd_putb(uint8_t b);
-void lcd_clear(void);
 
 /**
- * Buffered/async access
+ * Clears the LCD.
  */
-void lcd_handler(void);
-void lcd_put(const char *s);
+void lcd_clear(void);
 
 #endif // LCD_H_
diff --git a/include/serial.h b/include/serial.h
index 9cb9d24..7192e17 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -1,10 +1,33 @@
+/**
+ * @file serial.h
+ * Provides basic serial IO (through STM debug stuff)
+ */
+
 #ifndef SERIAL_H_
 #define SERIAL_H_
 
+/**
+ * Initializes the serial device.
+ */
 void serial_init(void);
+
+/**
+ * Puts the given character through serial.
+ * @param c the character to send
+ */
 void serial_put(int c);
 
+/**
+ * Gets a character from serial.
+ * @return the character
+ */
 char serial_get(void);
+
+/**
+ * Gets a string from serial, cut off by a newline.
+ * @param buf the initialized buffer to fill
+ * @param max the max amount of bytes to write to the buffer
+ */
 void serial_gets(char *buf, int max);
 
 #endif // SERIAL_H_
diff --git a/include/task.h b/include/task.h
index c57b2c0..eda2dcd 100644
--- a/include/task.h
+++ b/include/task.h
@@ -1,10 +1,25 @@
+/**
+ * @file task.h
+ * Provides multitasking functionality
+ */
+
 #ifndef TASK_H_
 #define TASK_H_
 
 #include <stdint.h>
 
+/**
+ * Enters multitasking mode. The given function acts as the initial thread.
+ * This task is given a 4kb stack.
+ * @param init the initial thread to run
+ */
 void task_init(void (*init)(void));
 
+/**
+ * Starts a new task.
+ * @param task the code to run
+ * @param stackSize how many bytes of stack to give the thread
+ */
 void task_start(void (*task)(void), uint16_t stackSize);
 
 #endif // TASK_H_
diff --git a/initrd/init b/initrd/init
index 324e519..c7ce93b 100644
--- a/initrd/init
+++ b/initrd/init
@@ -1,23 +1,22 @@
-func div9
-	if ((arg0 % 9) == 0)
-		ret 1
-	end
-	ret 0
-end
+print "Hello."
 
-set a 0
-set b 0
-do
-	set a (a + 1)
-	div9 a > b
-	if (b)
-		print a
-		print ", "
-	end
-	delay 1
-while (a < 100)
+set fg 32767
 
-if (a == 100)
-	print " All good!"
-end
+# draw bg, lines
+rect 50 50 380 220 6375
+line 50 160 430 160 fg
+line 240 50 240 270 fg
 
+set x 50
+#do
+#	delay 10
+#	line x 170 x 150 fg
+#	set x (x + 20)
+#while (x < 430)
+
+#set y 50
+#do
+#	delay 10
+#	line 230 y 250 y fg
+#	set y (y + 20)
+#while (y < 270)
diff --git a/libinterp.a b/libinterp.a
index 2c87928e2e47b265263fc6e28b9d2aa117efc93f..39214904585d534566cba3f5055f5dbf689d8a17 100644
GIT binary patch
delta 14293
zcmbt*33ye-+5gPBYm%GfhJ@TKklf^k?2v@81VR#^G3=096mUyI7H%LUk%WN6a-nY2
z@+n~~qNISh)VhI&Rs>wC(9*gWYZd(zt+sWkMvE;KD*xZ_oVgKv{>%3~|MT24@4V~0
z^Uj=^IWy;e_Nnc_pKV)GLz7A-j2~Yz-tRB=^EyBE`^zRxFsXijeWVbgS_s>b|Jj}P
zsSy8@JM{k&s;U>_|L5K`D8&Eiez0Ct2_*m9`>A_`_`ltM%@X3TS!zq>r2~895gF0a
zy0)u(Rcre))od#(=xXmozPm+$*4@z}#M0HRZQZTyU1K_m%#fChFVUe_&lDxvCX`K5
zS0BzZuJsL^wbj@{6YWCahs!SKAob)*Ax0V|MV!{qcojq=wHQ>JbaoLbWioQQNpUv=
zu^Em@#0=L{WL*wbqiQKBc1JoXFC%YE>ozH_D6nmAM_h=SZWn>w?m$H#?%GB1Gzun+
zqS7g5lO{6z5#<XPF}sb~;#OoG9(zO_FlP^}+9UUXB&AC@0fjxvLY>0-J)#~HwHw0q
z7owr)0|c%UOk-%oE!=h=O-ttq0Ao55d+c-IN6>(rPRY2%phiB0tcd(RvNE#SfNW$k
z2)4)siU<QeQ#hQBV7u*UNF9EM`yD`61(66cM939QsYuf8u7}8o`T(ih^%EF$c<7zS
zbqVv)AA|07&7n*T=?N}WLpWk@M?T3lk9qGN<ddUTHFpa~919qMvdvoA>9N~BXr|;C
zXCdkc4Qpkdp>ia~!GuR5K?IOS{}|M4WMY_r_)mz&dXS%j+dB=3Av}cuXtQ2`xFU!-
zqsevHkhO$cfttcnc$QFV3CuWSNOssl6dUFSMY`zcuy>htGaLUkvu$)@He??Gl>Nt$
zOK9x|ojw_TZNqznY&YxE*Dd1dldPkP6S-<rB?7LPDs^F%Mj;z0WAt^065pdxqlI>g
z_%B%K5~6=Yj-62U7l$n@u`Hk<_DeaRVvj*=f+^M<7MrgNN@QEfAF!=Zl!))6ci*E@
zCm7SI6zab(to6OHd#KSxmOtIYyH|D!Ig>I*U#IZd<5`>>PqrVqTH5G;D{NwX*hIUK
z6NiFwltQDZvPIvrKLyV`gEB>qI!`A@>oBOfR=!gtt)SZ}P&M^sfAaMvA=^;r?oCy@
z<F8a_rliD2<2jxjRUS1fzAOseC|k^mSNRELapQz7#-djxPr>sMuO5BZrv`s*AD`eD
zQZbT*7!FBofoS5libQ>}A_{hsRBiWgR5w`-3@>uUA_Rumt#&>;M_rw`NJ-!FvX)gH
zD;q`2>h{LEZqd`;u(G*JT(r3MVo`I+{O<{jFlC^(n*8SWCJ>sM+q>&lcdCY}ThdK(
z7oMKFy44UZ9Shm6o`$y7&7!@vX|2jQ;!6O%c~vJKvF24AbnB?2>W(B$85(&TwK_}c
zX;{_8q_tsbTeE1R6)|i6!i#2HbaA-srj9l3YV*{w>co)|QI=<I4NIHbR73A@6?rr|
zz*1Jj&lb9G`eaEpb?Az$YE}hDs}@_-HNjSt)MZsnw6(S)0Cja?&6>FjrY#h$Z5<6w
zb&VaXn#Jm_<|at5Ywo_LvzY~;a;O*mwCuIE417M)<_@JZ*zrQ-YdBfMsT$U3I9J1q
zHRR(?y;T~n*YIWyIgXRRN5e-nJgDJsEEp31(gXwDj|$Zq&eD*hB)dw7#yKPzBZSzX
zagM0e+os`eLfpU8_;HP&(Rd`EI>;vw8W^ccG@;xi2(d`xEgE)e`Y$v-pz*gg{uhm>
z;^Cv=3_=uEsBw<MMl424LeL-9kn@Q#;3~LP8nwgJ_QIXUGx4fybiPq;S8vSAbo>pr
zW~y`Z0*<>~LR_VC<_8QJp*jyHs?SDyjpD?uW3n9?5q$P`fi*Qz)q*e%E3G@#=ODb~
zQM<=vI|ZhqVyUJs$TVgqs=+bYMsbYVcPQIvi&0aHvK?2%32{n&Q5~<=7kQ0iiE2wx
zo=dMS2A(Ne=?^1ZXxK~2CQelIYjfq{fi<;PJEy6AV(;4eN%bPo+av;q8bqMHsXVCu
zEs8~fd{qRtyzlxV$(B;Hb5>dK+`qm#cc^u8Fut1nfXUyW@)qTU&Md7zd8kzsjC<u<
zer3VvR}Zzy(nAfFg&Qug;QAuLNUm9H+B~qdw{3^`dU<^Hg28iRQ|f!$WT}N8T%J;Y
zu(h`}zB+8BOIyiBdGy4z6Vis(4jEbp#jw%TpeV4t+A(Oel{Y!wr}5sV3yofNforT>
zQVlC>s}Tk2mEJb$!?n`#rVrmcvphAJy4E&0#rD=?o&wt|9fQ)=P~P<B5W@gN6u4iZ
z;N`k#14SQu?^}lkzBpIqfMKhaA~OZ?zv*;UaoWk=U`lIm@bcCjBEA|0!NTpQtNaty
z!;900R~5@rN`X>r6ukW=bt=_+i+#3A|0s24aUM!psdAR&L{*xSm5{7dOO}ibjoaw=
zvqGnrQm3ML#7Xqsq3d=~EKk-2<674RFK*o`BCF$2a)qC{VZoGo%CPhb*sLga6@2g}
zy)0iU(Qihc4A%r6>(F=$VqdkWuO;<{bVXBxJA&axx77s9hVE_pR#_CdhJunBWRU*w
z>KTNQMy;?0z(3UJK6z+`<#6hdy+bQx`Ju)`D@4JdsdIU7ZE*XH(+y|PEsNwUXIlRR
zFJ*bS_=c14ys_qFFVtLLc*L^V&J0GVmxfj7veb~7L!V3y-Wi01Ev$()8Y<jgnsNcp
zdjaqG-^Ds=?)z+6WLR4~jS@?H8`rJqZM$>&{^N{dn8&JK7VHgP*3cVND*5tQ-?yP*
zFkFbJ`DCc7%hMN?H)fqI*Pf(6E4j6N`3@0Pog5@JihfV`z7m#T=&eruEhUW0((=a1
zra!MAKdpXw`6yYV-nu-`Q{I+TGk4;XHCvt(PY=Xg@t7^mKa5LgUUqpH8PAs(56$&9
zNK@21bvX%TAmgQDr3qX+IcUG7lIyF+mth>$Zw}j;wcZ?xDQCSo^f-{c@Xg`4`mg$V
zQICKT!NtFksXnYPjCq}cQ8m!Sa{di<mpiF~bATfv2pQpe5!M}%e@5Q!iowY1h~n#s
z+qDS_;idaQ_~nTH9CWX1xaw}W)A=zhIHT3J2*2|WAUk8!<fYS$uN~@#OXp_3gc9BD
zHck|$kVLr5h2T@jMiwqbnZ`Et$<leV+94KsFL}b{gcp$yOoa%X{3(i#e6YjRhw;e0
z@yI6GjbaFS68Z9#?0`o}p3zQ7x;{}G8xxb4z?!F+*4(bopk?JfuItpk#*2~<kXuHs
z-IYb|BulbT#WV$yH_>nfDM_w1FzKmeeuV2aHM^-q#;9wXCPsfk3s(e?3fE-yOw%;E
zQ5ntoa<>}Y+?^alt)mHUA+lW8Q}S3D^0}_h)WPO*`Lz0H^9*^vs%)7S+W>B^-BV@^
zBG_p^SGTm3P9IN=X$A}Rrj14FnQq*LnJpo$j-FMUoZ_@9id|%|7mZ8fyzH4_a>~*c
zDBH49c~VVWwm|MxH!XW?+%0ryq+9_N|5h6DWXLDrQkq$hfSDI*x5JbtOR`{lT9H~A
z%uWrmkV^SAWJTJCM5;{0nO2}431-Wy)gO_*tIh_Kb01|PR~bKoXl>e8ETzsk3dO}~
zT<m-5jV%DdG@&Y5lXG{I-)N+wUK`RnS;;1&0LZ4aDsr05s_afXs@Atol}+mD)|;al
zD^Hsd86iaAsJe9dWuco%`HwLGjjXv;`^I<zAnps$Wdh&0te3X9dXy}Oe@htUC80^O
z)9=F?d^6Gh+dOzV<cmKz1&D>M@6`J2^)LvWVYc-RuFvtKp=67x88Z6j=6nc-TqbGT
z=$o0_(b*-yq$yk9hEUFL=t`?RfEwb}F6SK4<tA$DJG(yT3DD&Vjh|kh_bHsYAGD7F
zb0od$l6y?u6}hcKc56dTB5#{Vgv6a-C8DTYuKVQ;np>ZfLnm*P=5yayC-OS64!R1m
zvndNZJGA8D{2p-Tf|J|Uj5n-)v+<3-Y9aC}V}zIvPP5i|RO>7h`5VC6fH!^9)-N@^
zHvd;3PoXV@;Bg(1sla2|{`bI)w+6wA6$N}y<uUfND-hj<j7k4hP%bosf6R*gL!m-5
z_Q$Ny-ya%n#`5<%l%vl%uzr;qojTf#q>0)34u?j^vl*Xf5k_BdjM*x$ePy=M!lDoh
zyh>h+7#Cf}=9AKiep>VZn>tCJVBUNoTqG}JJM5%<x~}HTyx&9YSs3mMA$DW%Uim(|
z5&A;@JK$Ua&X`p~zGV?>5lI@K5As8hXY>u-q|2~S#PyseM`&`3$U6;<*<ih+StB*8
zS>zo+_pbqKSPbLOZ4p@*Znb<ev%q92dD`K6cp&g(9Ra-tLC$SJLzhU#+t#-~luus2
z))}jHP>KB0pfA?+T1^KY%TCn}Wp7Ogv2%!m8`w=Zv$}4y>p}*!|6;89t=8Pk)-?JS
zT8+7xjcN4N7MjhqnPLcBUK$kFqO2ETcZ}JWZ?&4aTjcEqkFoe@h}UoN>WdIsG|dJu
z(_zR`yxU@Sj;43==hkz11)J$XwYS|D+H3LK#xyl!(`4TsC>wn%$bZsmu_o4oLM7iv
zmE^{QsNQ^_vj3i;N^P_%)mCU0veBwkuyBAKWuw!qViQeXXPN941wQtzo}fgZT?>QL
zO@pU~4E9`LuqSLVlXd8!n9*k%TpKoMv)eh;72HgT6{MEI>{Qe29B(-ID=sj*0%k+7
z6f89Du6P*I+V0A*-GT%T9rZ*{!F080aL16r`U?!!U*KoG6>HParD1zx`DQ2=k;RwO
zh1?yJ{T~h)T%-+_B3g?qrC|O8kmLr`7<A($R(oNdFPKA9)f760`wi3547|Zv9j)53
z)MT|uwdGoUJ{Kg<Xj?T0gnG7fSZJm$2;^~JvtcT?Ly8Zh>|YLprQD9IwCr_@l3%k~
z3lD?+wkdKvEK;b8%sT=)S0abOq0?iw0Ko=X{$BuVaF4-|SZu|oP1K3}GL)B1I)o=!
z!kt2luK-E<kO-D0`>mS!bd2&Af>?&zgQX-jGj%Z{e>13=xJk_(c<ky;Mnsgn#3%6@
zU4s3kWH}alR0(Q*x6504;U3jERrGAK9M4TC^>Br+a0)tG_*#fz=ylw0;O3|pzK)@*
z8DfM~yPln;YFEF8k%CJw3@E;V$vvZ`XV<dT6`2)tZEfAQB(-YItVChhZM&Gb(~(N&
zV&~kdq73!)njgef&&Dg*lD^E6UDuJ7v1TB!c7|R3F=hV1v)8&Eqc}ZGi}74<yUDmk
zPK#MQE!t(<W5jr-MMs-s9n0M}@cG7DWrM)*XI+wS{=#z}4j;us7|pHA;&bW`<K%C`
z5EI6!-+vxXe%Zjg*WGQ%h3dK+3+6ovWv&~B2`M;IgfA~Li@t+j`5nCFJNR;S=En56
zYraEWKTv+tVyW)jR5fs7(-s+;iAOUM?Z1f-Pv&;QDMEaSrisi$v8b*A+)kK<VT^E;
z5Z3}mq8GkEI75i931`A{)G2ZnMpr^CG+PKuVV`h3rffpUk3mf%3o&$5S{ZS%hMP5H
zTn#kSVd8n{FNAQg26H|gtk-ZIAsjIfTvp^#Lddlc&c;YiI0t(;gmW<hX}%rp5IGwR
zHV|vLnQ%IGZwaAz8{s@egm6AOD<C`;pK0hvr;Z$lxsMPdOWDAopR93&65ywS$1s^N
zU5HVHIhgx2KAsRAyISK5HEhzbOT(=i-lZYC2JQWt5c)4^{1c745C`x>!p95*N;I6K
zVT*>>YIrXp4DQwVQyPC!!?!j3Si{pA@+gLS0S)sBQC^XWhcL=&Lb(>0uJIWfpRe&B
zXnd*0do|pu;lqR@vB=Q)yBeO+FrE#=f;F5$$jP&V8F+Y&W|%Due4D1<qv2zk|B{9u
zYv|zI2zj<J3s|D@I*qq${8|lf*6?1ykQq`Ep!k$#yrAI;4gaO#Sq+_dz9~PP5CsP`
zEYWbThL;jTu36(<8gA6E-^;le2JX{>ztoJEHU1Zk4{H3J#-lOEP%o7b1r%#IQ`6^b
ze1*oZ*7$#Ec%Oz(##LDcUekgnG~+{!|3l-^m~B{)6C;d)LlgL6;&}s&w>>B26qU0r
z;CKj+^GUS;xlRPittQS3$jxfUwj5(^ta{~%v}hPGueD&OsJ-(7&aKF04KufU`^)ic
ztE$@r&R=B+@r|K!=Vu!GvxfG2v#Qnp+p`_7VNgrrcJ1&GY@Ih+ici6LLAkaE<TzEZ
zJ;!k%7kyhT+8!`IE5c52;;_5Fqu?)A_iWFG^UrV3F;16oQ`k8UW8k1&`R~YdX5nb|
zCaF#?$aI{=0QHQyNBpBZ;?LU;_Sq+npWs&uYI9`5z`J)mFNe*;cxg8)X_uE`X7K!2
z9o~`a{sdJw42Mg7x?}1%7luh&QX!;lKFHdNe}Jsvw%-9E+nY%2t}ZfpD(EPj%j{TH
z-@h;=7SfJ;$rDj)nSbDUWbMLMq+aSz&zucX%v6NLb_a5<M856C-VZ#<HTnU7sH;@$
z&k~crhFh*;T5(79fo$bHQD3UcpIwx^fU0HW+M_;4>Y8LpE?50O3nc%G+zL{XqT*<$
zlKBx)CF+fzmB<Y$a_7Y8t0;5DZ{fU%dP~jUIZdXjEj#n&WOZoghG;*z$KFQ>a--&`
znY+qmKwZCUhMcZm*flNI05{j}Dl=|_fbV;1#O_l0x~kosocn9)RU0g>*msgeUu19(
zXPoazl;oOWa>{&zs&998Ofwj+`35UJ)AzDEx;xwWx1s*NJ4Ys~;ddPvmrMPTG8Q0N
zLe}HTkd5fuKGXMrnHN4U4QELfY4>F+xhFd{f?ib0d-xpq789v55vT7qHGNNZ?s1Zq
z80)|mz9u4<89Y(4`>JT{a^shnuid^WYRjJF+&T2(Dx(duwZ4n#a-Gou%Zq)#Bd6ZT
zgl5pUNWHozS;neQklv*nch58Ma4fw0$I%RytIgOCl@WRB<GU{lWs~wBV-Y~wBg}te
zTnUhV5{aC!80P9xnCw4;)q)?((Fu$o_9Xm`JdmBhZ56y4WL#~Edrhn<6U)i6%~0cE
zZ^A}oC^no?5z%&9infy-_}GpoQf4v#HtuV2%l>xAvZSnVNgc?ukK%>PkC!i<U!JuL
z@sZgyZ}hEUnK@ROonlmTM>F2N$$AWTzG?S1+J$~P{h()%>JH#QmtvcS#13k)l(1N~
z>by50bW)SeT2MRSq19+MRUvX%Cct+;o@M$T9rhhB&C!-u!K|M^RK}X8h0xEL%#b;W
z@}dpsL)WQwEqS*kueSa7<bjI&DkYcYWBeB`#xsEGqh%iZWnOrG90;E?d$TS)Ngk!X
z`FW}<dyK3~wz*Yj_i&j5(J}D{v`ci${3rrr<j!Yjs;BSIQ)lnLa-jJam)O+%De(h;
zdg!>JjvXB~aB%NoSLguRl>`2JgouL=5hKhX1bv~#uhIA}4UcO0p5}j|ajr8>eGR$K
zM?2Fs&IgL$Yv_r^5N{5gdpsnKQ%P#W6YGrcN2;kWW=4!l#yTI7j#E{m)14J)v`L2A
z@?xg!Q5^?!j1NYtw_nUQw#BHyQ;90&C9iR6q$+$V+i8Q@Ziia@Ql_zHIOhU2|Bx5k
zuXTrVjI$%v3om8M18VP~9LK3dyrZi0mjm)Pbq;tNK9#u79QZ2_pFi*?4zwT6xq#p(
zDK0H8<5Xar%~B^{P6*v-9t~PYbher^^=E>z)H*UaP><t69u+oZpX|kfk#!(=MS=I#
zUL5#^@%94ytL3c+!HvvJ=_IGO!F|%AtZTg{7+Jmb-@+f}l!IU1@U1oBD|l6_<9w|1
z5Kb?Wa2B!QN%iH+mrf{oL+-iwbYM_C9gY5xgZmQP6LHVLeI_U}FRQl>ERC8o!8>(+
zVAU&KM*4ryWM~6icKH$pDi1eh`LzzOEjDF8exE$39z32WzfylZev$lxN_{QG{yrL8
zmA{q|^85%nSF^kU($RM3eY;U$%(b97?_bUA*GQbdAXUU-1{V8}^D?pF)zHOLZHL==
z_ZuL%Zh{-md)Grqxc<rf0~<lceE4&?<$UmQD(y$&+`ABIoZU9uA=I0%)knn+0&jvT
z?><%i$LY~$k#(2Tkk_?OsXuna$MVErG|ZSqr;7xKO$~p2T2$;t(0D_$;q@Ky6dU1s
z8>#y_p3wMRzfiG%`e98SD77xUI0^ULXW-gGmtq+wd91S7#r-7r`>ewiuDeM8Gs|ug
zJ_3p-naO7ZfB2I_8YueBH<pB0R1!B!lgt{s?QRg<_DWEE%aOg2EK84)B!wk|l%dw{
z3uK_Z83Z%Tze2{Wt6|~43FBzs-E>zy`sTG!u@}L}V$5Nve%XnuQ(1*z${)}H+zkei
z&Xhxta4*HV(vcITA(HM%;dty`X7V3OX$Q$2G?D!&^T=s6k;5sHkyvgbM^buN<_d#O
zzaU~Ilv*(qnI0xv_%&hNW#K;#<32HR(A{Y~>=qM6%4am%MFeZkXNYtgPXbvhVjo5k
z%$i0=idgo@7foC}{8mnsS?D<nfA_7@s91)i0^=F#KJx9f&>Ju&BhNr7)0|(Un6)O7
z9zI3<z`~jY`=FGC%`KCR=~e{zEuh2+kPtlK>w%)|e_TtMWK)WZAbBaJxT8ATl=^Qi
zb!munbLQjsb#j3lB6CfVa}>c0x?o6xD@!@^5y)L;N@U;>&T0Y4l7K_=;jFA6+JxIG
z>Jmt0zfa>8%<}94m8jBI@#bQ;-vSQ<{6Ivele`_)UocB}h`Kx_l<Av6F#0;O17v8d
z-Ljj`K8+Oz?Ph4ZBKOBsi)J)=(WdOr;yg?eHY;<?bBe-P_6<6PY1wPBf;p&moJH@>
zSw58SRGX%BssF@hOi8pRSI4Y)j6OaY6~&LZxJ4F&FTM1%izh<LS@EQLGw{Jz5nkEj
z@S)bgvUk?Xc%EQ|FYe(O;>6H|y5{5xyg%rDuxL4FNpQ*P>z2$#qzv1-EdbKl;<QC{
zFUgp9-JB(TeH9h%go<SYw)fsK&ierN<ez&nBaa%m`GZf*8Cf0N>#1QFrp36e4KP18
zz>FC&ZtQ>gwJ+h&56L7^=Bf*1nxxwQ*G&0{`qN)?47aiMZ<)qILuCQ%G}O$$Wg7`L
z)%mxlGERr<C-8A2@*Y&vx+IQnu!vN*ew3<~f0Q*AwIAY8lAX}HEXld&;pC&ZXFl2!
zqO;sH8=-{>IP<fMgfHUxxbMLI0&dC|1BNg1u|XvwP{dq7^0{{!zR0h^&GV$$faG(y
z*(>qV&BuU*O8~<c6&k__Ao1nj!MVZ953<4r+0}Ld=MzkO974hu^>4<_5BoR{kgrUp
zD*j|d=FkVv{M?Q`dSydfTSuelS=q3nS+uNbZdQvwX~B{@5;~E1=T0I_72*L6*-BhO
zoz)QLP28>_rw8&A0Qm{8pAh>q#e`{SMe@_FuQq9SH|ZG&HX(36`H`VaY{4<Zrhzf;
zDcT9)RW=|6D+$48W0PO2`JB{Q&@F^8{0bqq)=p@;9f2W#CSe}70tq3vK|>6;V&KkC
z6Xf@~I585m%YZ91-lO5o8vazn0S%wgkX54on;L#FaPIGmY@r?ul#I|;La_Ta&LcG9
z&uaV~jenqVHVOGoLg;5|yinui8egp8l^QP7{2mK071wLVRt+E4@Nq&IW&{lMBX%X?
ze-&H5oDi{r7#6D6tEw+^QU*14O3Ng%j^JWzzVpj3ap10Uw`E3Lfre*?8K!m>rpqJh
z>B1c2h)r!t$H#R4@PcseA34tF5qKG;3QuJ^7P5n=ADjv}U%)QgSVPs$PvlZ@==w(O
zI+bJW52$0OvK?vICR(okaVlUO38<v6vW-o{)Kq{qN#<gE{a0Sc{ph|^l=>>*cp-o$
zR)@X{7#}2a&&A<K=iaTN{uyvQg8|{r@V9u5x#&xe5KHOmZfa{?8vgd*@4xWtf5+Gf
z<I2okm{2{ICb%5qOpq($@zi<tZ`gl>{!GvH#R%J(`rcqMSJYUKb7|a*rEvn5##f%U
z_Zs^;XKdJiot9oOC~U6JwoK*+NFFWGIfKs^mT0)_vJI){FGwa4$G~EKyUeVC9W!C%
z79+JSMS{-G)u8=KB+S4`yHNsQG>$^*{0fQmZbC{GKe2vd*b0)~Tam$3@6IRLdzXoI
ziU_-%J2a8@exwo7d6wlz{nRA=+)SBwW+0I^5_r+N>=&qmYw2n%0ZaxaRoBXfwZO<Q
z`s&^9Qp{$RyVippT%gWbNVzbHuyYFwlsGvmCO*m*lZyWs40C#Y>SyuZK)kfYd^@k&
zIj{2TX}-H*r<R{PJHrQ2Q(@=)ucO@;zWYXGLA(<7QAuiY(vIRM*a$jD!{~8p|M1NC
zTKb}|9|9U;DQ4tkb>#l65C&JX>ok&&e8Z|`V}h)t^<DGm*7izE)0(u0w^mln%UE;y
z9K(fA0wCNaR=0PxE^BXY^5Y|7d~v+2eRX49PeWZ>YZpGE4*yLB=hdCvtMEm%MK20=
ztZXi7Y`aGN<eCwlx`s|DT0Hes>gtS^j#VogpdEIt1>Y?bHUH|;7;IRjJ|8(&{r;%8
zmaP@On8)n?BjY+8fq8DSO^e|&V1aoGHvPAl=%0HQfx^O0D^T8#ds>YBCTMseJWFL)
z-x!a9<h;u!Y$8(ir6;TUNA2qEbgz2jBd^;1Td(T(d*h<aLp1M@e6;%Fx9RGz-#abV
z9F-7BvrBPuLjw!;Xg_Y^-&QcITV&yL>~OTKnyQlDO$wP$07knC=x|P%tsy67;&p^@
zc%8<7qTzN8AJOmtA>{t7@h>&B!429mM^YrL3FSI0s2m64cnl^CtWM?%H8>|z?I{?p
zK7W44B+P8AgsBQ(ZVJ^hqpxrnGk{YLgQt02uWn8E#pNK6cZUn97;D`e0L<%pq@1I}
zS2$Y;0wx+URWm-ov$h*~y3TQjH!V-W9o9isYzFc$hs$B}zr(>M3BH=HU~JDfe7%kb
z4ZCoM4L5v8oquoHNW;nW{d^0z!2(_Js+Ujs#ug*Ti}O2Q*uodHyw_?NmV3*_*<tAo
znhaoG9{9m=HGI)6UK??rUwA(X_k%|FIY5Qo--<liq7%Tp*4jDCMC=FO3pe7_yNA+^
TBM$Rm0iS$34#UnKR_}iSaXp&e

delta 15216
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
P#a>UU<p7L!Q&Il|Z8eQ5

diff --git a/run.sh b/run.sh
index 88be7fa..a031d27 100755
--- a/run.sh
+++ b/run.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-openocd -f /usr/share/openocd/scripts/board/st_nucleo_l476rg.cfg \
-	-c "init; reset halt; flash write_image erase main.hex; reset run; exit"
+#openocd -f /usr/share/openocd/scripts/board/st_nucleo_l476rg.cfg \
+#	-c "init; reset halt; flash write_image erase main.hex; reset run; exit"
 
-#openocd -f /usr/share/openocd/scripts/board/st_nucleo_l476rg.cfg > /dev/null &
-#gdb-multiarch 
+openocd -f /usr/share/openocd/scripts/board/st_nucleo_l476rg.cfg > /dev/null &
+gdb-multiarch 
diff --git a/src/display.c b/src/display.c
index 8b62e6a..955cf8f 100644
--- a/src/display.c
+++ b/src/display.c
@@ -19,10 +19,24 @@
 #define LCD_D6  GPIO_PORT(B, 10)
 #define LCD_D7  GPIO_PORT(A, 8)
 
-// bbbbbggg gggrrrrr 
+void dsp_dmode(int mode)
+{
+	static int old = 0;
 
-// 00000000
+	if (mode != old) {
+		gpio_mode(LCD_D0, mode);
+		gpio_mode(LCD_D1, mode);
+		gpio_mode(LCD_D2, mode);
+		gpio_mode(LCD_D3, mode);
+		gpio_mode(LCD_D4, mode);
+		gpio_mode(LCD_D5, mode);
+		gpio_mode(LCD_D6, mode);
+		gpio_mode(LCD_D7, mode);
+		old = mode;
+	}
+}
 
+// bbbbbggg gggrrrrr 
 uint16_t dsp_color(uint8_t r, uint8_t g, uint8_t b)
 {
 	r &= 0x1F;
@@ -46,6 +60,22 @@ void dsp_write_data(uint8_t data)
 	gpio_dout(LCD_WR, 1);
 }
 
+uint8_t dsp_read_data(void)
+{
+	uint8_t ret = 0;
+	gpio_dout(LCD_RD, 0);
+	ret |= gpio_din(LCD_D0);
+	ret |= gpio_din(LCD_D1) << 1;
+	ret |= gpio_din(LCD_D2) << 2;
+	ret |= gpio_din(LCD_D3) << 3;
+	ret |= gpio_din(LCD_D4) << 4;
+	ret |= gpio_din(LCD_D5) << 5;
+	ret |= gpio_din(LCD_D6) << 6;
+	ret |= gpio_din(LCD_D7) << 7;
+	gpio_dout(LCD_RD, 1);
+	return ret;
+}
+
 void dsp_write_cmd(uint8_t data)
 {
 	gpio_dout(LCD_RS, 0);
@@ -53,7 +83,7 @@ void dsp_write_cmd(uint8_t data)
 	gpio_dout(LCD_RS, 1);
 }
 
-void dsp_set_addr(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2)
+void dsp_set_addr_base(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2)
 {
 	dsp_write_cmd(0x2A);
 	dsp_write_data(x1 >> 8);
@@ -65,9 +95,20 @@ void dsp_set_addr(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2)
 	dsp_write_data(y1 & 0xFF);
 	dsp_write_data(y2 >> 8);
 	dsp_write_data(y2 & 0xFF);
+}
+
+void dsp_set_addr(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2)
+{
+	dsp_set_addr_base(x1, y1, x2, y2);
 	dsp_write_cmd(0x2C); // begin writing
 }
 
+void dsp_set_addr_read(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2)
+{
+	dsp_set_addr_base(x1, y1, x2, y2);
+	dsp_write_cmd(0x2E); // begin reading
+}
+
 void dsp_init(void)
 {
 	gpio_mode(LCD_CS, OUTPUT);
@@ -75,14 +116,7 @@ void dsp_init(void)
 	gpio_mode(LCD_RD, OUTPUT);
 	gpio_mode(LCD_WR, OUTPUT);
 	gpio_mode(LCD_RST, OUTPUT);
-	gpio_mode(LCD_D0, OUTPUT);
-	gpio_mode(LCD_D1, OUTPUT);
-	gpio_mode(LCD_D2, OUTPUT);
-	gpio_mode(LCD_D3, OUTPUT);
-	gpio_mode(LCD_D4, OUTPUT);
-	gpio_mode(LCD_D5, OUTPUT);
-	gpio_mode(LCD_D6, OUTPUT);
-	gpio_mode(LCD_D7, OUTPUT);
+	dsp_dmode(OUTPUT);
 	gpio_speed(LCD_CS, LOW);
 	gpio_speed(LCD_RS, LOW);
 	gpio_speed(LCD_RD, LOW);
diff --git a/src/display_draw.c b/src/display_draw.c
index f52cd8e..0d26e9a 100644
--- a/src/display_draw.c
+++ b/src/display_draw.c
@@ -1,15 +1,54 @@
+#include <display_draw.h>
 #include <display.h>
+#include <task.h>
+#include <clock.h>
+
+volatile uint8_t lock = 0;
+#define LOCK while (lock) { delay(5); } lock = 1
+#define UNLOCK lock = 0
 
 static unsigned int curx = 0;
 static unsigned int cury = 0;
+static unsigned int curxo = 0;
+static unsigned int curyo = 0;
 
 extern const unsigned char inconsolata24[192 * 156 * 2 + 1];
 
+void task_cursor(void)
+{
+	while (1) {
+		int x = curxo + curx * 12;
+		int y = curyo + cury * 26;
+		dsp_rect(x, y + 24, 12, 1, 0xFFFF);
+		delay(300);
+		dsp_rect(x, y + 24, 12, 1, 0);
+		delay(300);
+	}
+}
+
+void dsp_cursoron(void)
+{
+	task_start(task_cursor, 512);
+}
+
 void dsp_putchar(int c)
 {
+	if (c == '\n') {
+		curx = 0;
+		if (++cury == 12) {
+			UNLOCK;
+			dsp_rect(0, 0, LCD_WIDTH, LCD_HEIGHT, 0);
+			LOCK;
+			cury = 0;
+		}
+		return;
+	}
+
 	unsigned int start = ((c - ' ') / 16 * 192 * 26 + (c % 16) * 12) * 2;
 
-	dsp_set_addr(curx * 12, cury * 26, curx * 12 + 11, cury * 26 + 25);
+	unsigned int x = curxo + curx * 12;
+	unsigned int y = curyo + cury * 26;
+	dsp_set_addr(x, y, x + 11, y + 25);
 	// for each row
 	for (unsigned int i = 0; i < 26; i++) {
 		// for each column
@@ -19,16 +58,22 @@ void dsp_putchar(int c)
 
 	if (++curx == 40) {
 		curx = 0;
-		if (++cury == 10)
+		if (++cury == 12) {
+			UNLOCK;
+			dsp_rect(0, 0, LCD_WIDTH, LCD_HEIGHT, 0);
+			LOCK;
 			cury = 0;
+		}
 	}
 }
 
 void dsp_puts(const char *s)
 {
 	unsigned int i = 0;
+	LOCK;
 	while (s[i])
 		dsp_putchar(s[i++]);
+	UNLOCK;
 }
 
 void dsp_cpos(int x, int y)
@@ -37,12 +82,55 @@ void dsp_cpos(int x, int y)
 	cury = y;
 }
 
+void dsp_coff(int x, int y)
+{
+	curxo = x;
+	curyo = y;
+}
+
 void dsp_rect(int x, int y, int w, int h, uint16_t color)
 {
+	LOCK;
 	dsp_set_addr(x, y, x + w - 1, y + h - 1);
 	int countdown = w * h;
 	do {
 		dsp_write_data(color >> 8);
 		dsp_write_data(color & 0xFF);
 	} while (countdown--);
+	UNLOCK;
+}
+
+void dsp_line(int x, int y, int i, int j, uint16_t color)
+{
+	int dx = i - x;
+	int sx = dx >= 0 ? 1 : -1;
+	int dy = j - y;
+	int sy = dy >= 0 ? 1 : -1;
+
+	if (dx < 0)
+		dx *= -1;
+	if (dy < 0)
+		dy *= -1;
+	int err = (dx > dy ? dx : -dy) / 2;
+	int e2;
+
+	LOCK;
+	while (1) {
+		dsp_set_addr(x, y, x, y);
+		dsp_write_data(color >> 8);
+		dsp_write_data(color & 0xFF);
+		if (x == i && y == j)
+			break;
+		e2 = err;
+		if (e2 > -dx) {
+			err -= dy;
+			x += sx;
+		}
+		if (e2 < dy) {
+			err += dx;
+			y += sy;
+		}
+	}
+	UNLOCK;
 }
+
diff --git a/src/heap.c b/src/heap.c
index 8a18d38..2157aad 100644
--- a/src/heap.c
+++ b/src/heap.c
@@ -1,54 +1,56 @@
-#include <heap.h>
-#include <stm32l476xx.h>
+#include "heap.h"
 
-#define HEAP_SIZE (64 * 1024)
+#define HEAP_ALIGN 16
 
-uint8_t heap[HEAP_SIZE];
+typedef struct {
+	uint32_t next;
+	uint32_t size;
+} __attribute__ ((packed)) alloc_t;
 
-void *_sbrk(int inc)
-{
-	static uint8_t *hend;
-	uint8_t *prev;
-
-	if (hend == 0)
-		hend = heap;
-
-	prev = hend;
-	hend += inc;
-
-	return prev;
-}
+static alloc_t root;
+static void *heap_end;
 
-//void heap_init(void)
-//{
+void heap_init(void *buf)
+{
+	heap_end = buf;
+	root.next = 1;
+	root.size = 0;
 	// what to do...
-//}
-
-//uint32_t heap_available(void)
-//{
-//	return HEAP_SIZE - offset;
-//}
+}
 
-/*void *malloc(uint32_t size)
+void *malloc(uint32_t size)
 {
-	void *alloc = &heap[offset];
-	offset += size;
-	return alloc;
+	alloc_t *node = &root;
+	while (node->next & 1 || node->size < size) {
+		if ((node->next & ~(1)) == 0) {
+			node->next |= (uint32_t)(heap_end + HEAP_ALIGN) & ~(HEAP_ALIGN - 1);
+			heap_end += 2 * HEAP_ALIGN + size;
+			node = (void *)(node->next & ~(1));
+			node->next = 0;
+			node->size = size;
+			break;
+		}
+		node = (void *)(node->next & ~(1));
+	}
+
+	node->next |= 1;
+
+	return (void *)((uint32_t)node + sizeof(alloc_t));
 }
 
 void *calloc(uint32_t count, uint32_t size)
 {
-	//uint32_t total = count * size;
-	//void *alloc = hmalloc(total);
-	//for (uint32_t i = 0; i < total; i++)
-	//	((uint8_t *)alloc)[i] = 0;
-	//return alloc;
-
-	// calloc broke
-	return malloc(count * size);
+	uint8_t *buf = malloc(count * size);
+	for (uint8_t i = 0; i < count * size; i++)
+		buf[i] = 0;
+	return buf;
 }
 
-void free(void *ptr)
+void free(void *buf)
 {
-	(void)ptr;
-}*/
+	if (buf == 0)
+		return;
+	alloc_t *alloc = (alloc_t *)((uint32_t)buf - sizeof(alloc_t));
+	alloc->next &= ~(1);
+}
+
diff --git a/src/lcd.c b/src/lcd.c.bak
similarity index 100%
rename from src/lcd.c
rename to src/lcd.c.bak
diff --git a/src/main.c b/src/main.c
index bab8f02..c70d24b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -10,12 +10,11 @@
 #include <serial.h>
 #include <parser.h>
 #include <stack.h>
-
-#include <stdlib.h>
 #include <string.h>
 
+extern char *itoa(int, char *, int);
+
 void kmain(void);
-void task_interpreter(void);
 
 int main(void)
 {
@@ -27,6 +26,8 @@ int main(void)
 
 	//MPU->CTRL |= MPU_CTRL_ENABLE_Msk | MPU_CTRL_PRIVDEFENA_Msk;
 	clock_init();
+	extern uint8_t _ebss;
+	heap_init(&_ebss);
 	gpio_init();
 
 	gpio_mode(GPIOA, 5, OUTPUT);
@@ -45,10 +46,30 @@ int script_puts(interpreter *it)
 {
 	char *s = igetarg_string(it, 0);
 	dsp_puts(s);
+	//dsp_puts("\n");
 	//asm("mov r0, %0; svc 2" :: "r" (s));
 	return 0;
 }
 
+int script_gets(interpreter *it)
+{
+	char *s = malloc(64), c[2] = {0, 0};
+	uint16_t index = 0;
+
+	do {
+		c[0] = serial_get();
+		s[index] = c[0];
+		if (c[0] != '\r')
+			dsp_puts(c);
+	} while (s[index] != '\r' && index++ < 23);
+	s[index] = '\0';
+
+	variable *v = igetarg(it, 0);
+	v->valtype = STRING;
+	v->svalue = s;
+	return 0;
+}
+
 int script_delay(interpreter *it)
 {
 	int ms = igetarg_integer(it, 0);
@@ -56,12 +77,61 @@ int script_delay(interpreter *it)
 	return 0;
 }
 
+int script_rect(interpreter *it)
+{
+	dsp_rect(igetarg_integer(it, 0), igetarg_integer(it, 1),
+		igetarg_integer(it, 2), igetarg_integer(it, 3),
+		igetarg_integer(it, 4));
+	return 0;
+}
+
+int script_line(interpreter *it)
+{
+	dsp_line(igetarg_integer(it, 0), igetarg_integer(it, 1),
+		igetarg_integer(it, 2), igetarg_integer(it, 3),
+		igetarg_integer(it, 4));
+	return 0;
+}
+
+int script_ppos(interpreter *it)
+{
+	dsp_cpos(0, 0);
+	dsp_coff(igetarg_integer(it, 0), igetarg_integer(it, 1));
+	return 0;
+}
+
 void task_interpreter(void)
 {
 	interpreter it;
 	iinit(&it);
 	inew_cfunc(&it, "print", script_puts);
+	inew_cfunc(&it, "gets", script_gets);
 	inew_cfunc(&it, "delay", script_delay);
+	inew_cfunc(&it, "rect", script_rect);
+	inew_cfunc(&it, "ppos", script_ppos);
+	inew_cfunc(&it, "line", script_line);
+
+	/*int ret = 0;
+	char *linebuf = malloc(100), c[2] = {0, 0};
+	while (1) {
+		uint16_t index = 0;
+		if (it.indent > 0)
+			dsp_puts(">");
+		dsp_puts("> ");
+		do {
+			c[0] = serial_get();
+			if (c[0] >= ' ' || c[0] == '\r') {
+				linebuf[index] = c[0];
+				if (c[0] >= ' ')
+					dsp_puts(c);
+			}
+		} while (linebuf[index] != '\r' && index++ < 100);
+		linebuf[index] = '\0';
+		dsp_puts("\n");
+		ret = idoline(&it, linebuf);
+		if (ret < 0)
+			break;
+	}*/
 
 	char *s = initrd_getfile("init");
 	if (s == 0)
@@ -87,8 +157,8 @@ void task_interpreter(void)
 	}
 
 	if (ret < 0) {
-		lcd_puts("Error: ");
-		lcd_puts(itoa(ret, linebuf, 10));
+		dsp_puts("\nError: ");
+		dsp_puts(itoa(ret, linebuf, 10));
 	}
 	free(linebuf);
 	//iend(&it); // nah
@@ -103,20 +173,11 @@ void kmain(void)
 	asm("cpsie i");
 
 	dsp_init();
-
-	dsp_rect(0, 0, LCD_WIDTH, 105, dsp_color(0xFF, 0, 0));
-	dsp_rect(0, 105, LCD_WIDTH, 105, dsp_color(0, 0xFF, 0));
-	dsp_rect(0, 210, LCD_WIDTH, 110, dsp_color(0, 0, 0xFF));
-
-	//dsp_puts("Hello, world! My name is Clyne. I enjoy car rides and long 
-//walks on the beach");
-
-	//task_start(lcd_handler, 128);
-	//delay(200);
+	dsp_rect(0, 0, LCD_WIDTH, LCD_HEIGHT, dsp_color(0, 0, 0));
+	dsp_cursoron();
+	//dsp_puts("Hey.");
 	task_start(task_interpreter, 4096);
 
-	//char *s = initrd_getfile("test.txt");
-
 	while (1) {
 		gpio_dout(GPIOA, 5, 1);
 		delay(500);
diff --git a/src/main.c.bak b/src/main.c.bak
new file mode 100644
index 0000000..95f3210
--- /dev/null
+++ b/src/main.c.bak
@@ -0,0 +1,203 @@
+#include <stm32l476xx.h>
+#include <clock.h>
+#include <heap.h>
+#include <task.h>
+#include <gpio.h>
+#include <lcd.h>
+#include <display.h>
+#include <display_draw.h>
+#include <initrd.h>
+#include <serial.h>
+#include <parser.h>
+#include <stack.h>
+
+#include <stdlib.h>
+#include <string.h>
+
+void kmain(void);
+void task_interpreter(void);
+
+int main(void)
+{
+	asm("cpsid i");
+
+	// prepare flash latency for 40MHz operation
+	FLASH->ACR &= ~(FLASH_ACR_LATENCY);
+	FLASH->ACR |= FLASH_ACR_LATENCY_4WS;
+
+	//MPU->CTRL |= MPU_CTRL_ENABLE_Msk | MPU_CTRL_PRIVDEFENA_Msk;
+	clock_init();
+	gpio_init();
+
+	gpio_mode(GPIOA, 5, OUTPUT);
+
+	serial_init();
+
+	// enable FPU
+	SCB->CPACR |= (0xF << 20);
+
+	task_init(kmain);
+
+	while (1);
+}
+
+int script_puts(interpreter *it)
+{
+	char *s = igetarg_string(it, 0);
+	dsp_puts(s);
+	//dsp_puts("\n");
+	//asm("mov r0, %0; svc 2" :: "r" (s));
+	return 0;
+}
+
+int script_gets(interpreter *it)
+{
+	char *s = malloc(64), c[2] = {0, 0};
+	uint16_t index = 0;
+
+	do {
+		c[0] = serial_get();
+		s[index] = c[0];
+		if (c[0] != '\r')
+			dsp_puts(c);
+	} while (s[index] != '\r' && index++ < 23);
+	s[index] = '\0';
+
+	variable *v = igetarg(it, 0);
+	v->valtype = STRING;
+	v->svalue = s;
+	return 0;
+}
+
+int script_delay(interpreter *it)
+{
+	int ms = igetarg_integer(it, 0);
+	delay(ms);
+	return 0;
+}
+
+int script_rect(interpreter *it)
+{
+	dsp_rect(igetarg_integer(it, 0), igetarg_integer(it, 1),
+		igetarg_integer(it, 2), igetarg_integer(it, 3),
+		igetarg_integer(it, 4));
+	return 0;
+}
+
+int script_line(interpreter *it)
+{
+	dsp_line(igetarg_integer(it, 0), igetarg_integer(it, 1),
+		igetarg_integer(it, 2), igetarg_integer(it, 3),
+		igetarg_integer(it, 4));
+	return 0;
+}
+
+int script_ppos(interpreter *it)
+{
+	dsp_cpos(0, 0);
+	dsp_coff(igetarg_integer(it, 0), igetarg_integer(it, 1));
+	return 0;
+}
+
+void task_interpreter(void)
+{
+	interpreter it;
+	iinit(&it);
+	inew_cfunc(&it, "print", script_puts);
+	inew_cfunc(&it, "gets", script_gets);
+	inew_cfunc(&it, "delay", script_delay);
+	inew_cfunc(&it, "rect", script_rect);
+	inew_cfunc(&it, "ppos", script_ppos);
+	inew_cfunc(&it, "line", script_line);
+
+	/*int ret = 0;
+	char *linebuf = malloc(100), c[2] = {0, 0};
+	while (1) {
+		uint16_t index = 0;
+		if (it.indent > 0)
+			dsp_puts(">");
+		dsp_puts("> ");
+		do {
+			c[0] = serial_get();
+			if (c[0] >= ' ' || c[0] == '\r') {
+				linebuf[index] = c[0];
+				if (c[0] >= ' ')
+					dsp_puts(c);
+			}
+		} while (linebuf[index] != '\r' && index++ < 100);
+		linebuf[index] = '\0';
+		dsp_puts("\n");
+		ret = idoline(&it, linebuf);
+		if (ret < 0)
+			break;
+	}*/
+
+	char *s = initrd_getfile("init");
+	if (s == 0)
+		goto end;
+
+	char *linebuf = (char *)malloc(120);
+	uint32_t i = 0, prev = 0, lc;
+	uint32_t size = initrd_getfilesize("init");
+	int ret;
+	while (i < size) {
+		for (; s[i] != '\n' && s[i] != '\0'; i++);
+		lc = i - prev;
+		if (lc == 0) {
+			prev = ++i;
+			continue;
+		}
+		strncpy(linebuf, s + prev, lc + 1);
+		linebuf[lc] = '\0';
+		ret = idoline(&it, linebuf);
+		if (ret < 0)
+			break;
+		prev = ++i;
+	}
+
+	if (ret < 0) {
+		dsp_puts("\nError: ");
+		dsp_puts(itoa(ret, linebuf, 10));
+	}
+	free(linebuf);
+	//iend(&it); // nah
+
+end:
+	while (1)
+		delay(10);
+}
+
+void kmain(void)
+{
+	asm("cpsie i");
+
+	dsp_init();
+
+	//dsp_rect(0, 0, 40, 40, dsp_color(0x7F, 0, 0x7F));
+
+	//dsp_set_addr_read(0, 0, 39, 39);
+	//dsp_dmode(INPUT);
+	//uint8_t *buf = (uint8_t *)malloc(40 * 40 * 2);
+	//for (int i = 0; i < 180; i++)
+	//	buf[i] = dsp_read_data();
+	//dsp_dmode(OUTPUT);
+	//dsp_set_addr(40, 40, 79, 79);
+	//for (int i = 0; i < 320; i++)
+	//	dsp_write_data(buf[i]);
+	//dsp_rect(80, 80, 40, 40, dsp_color(0x7F, 0x7F, 0));
+
+	dsp_rect(0, 0, LCD_WIDTH, LCD_HEIGHT, dsp_color(0, 0, 0));
+	dsp_cursoron();
+
+	task_start(task_interpreter, 4096);
+
+	//char *s = initrd_getfile("test.txt");
+
+	while (1) {
+		gpio_dout(GPIOA, 5, 1);
+		delay(500);
+		gpio_dout(GPIOA, 5, 0);
+		delay(500);
+	}
+}
+
diff --git a/src/serial.c b/src/serial.c
index 1caa595..de28275 100644
--- a/src/serial.c
+++ b/src/serial.c
@@ -35,8 +35,6 @@ void serial_gets(char *buf, int max)
 	do {
 		buf[index] = serial_get();
 		serial_put(buf[index]);
-	} while (index++ < max && buf[index] != '\r');
-
-	buf[index - 1] = '\0';
-	//return buf;
+	} while (buf[index] != '\r' && index++ < max);
+	buf[index] = '\0';
 }
diff --git a/src/stm32l4xx_it.c b/src/stm32l4xx_it.c
index d007607..ef10406 100644
--- a/src/stm32l4xx_it.c
+++ b/src/stm32l4xx_it.c
@@ -3,7 +3,7 @@
 
 void perror(const char *s)
 {
-	lcd_puts(s);
+	(void)s;//lcd_puts(s);
 }
 
 void NMI_Handler(void) {}
diff --git a/src/svc.c b/src/svc.c
index 507855d..ad6e33f 100644
--- a/src/svc.c
+++ b/src/svc.c
@@ -24,7 +24,7 @@ void SVC_Handler(void) {
 		gpio_dout(GPIOA, 6, 0);
 		break;
 	case 2:
-		lcd_put((char *)stack[0]);
+	//	lcd_put((char *)stack[0]);
 		break;
 	default:
 		break;
diff --git a/src/task.c b/src/task.c
index 71c829c..ee338de 100644
--- a/src/task.c
+++ b/src/task.c
@@ -1,5 +1,5 @@
 #include <task.h>
-#include <stdlib.h>
+#include <heap.h>
 #include <stm32l476xx.h>
 
 typedef struct {