From 5bc67a31fecc1e05b87888b4b41d94b16eba001b Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Fri, 5 Jun 2020 22:12:31 -0700 Subject: 6481 --- prototypes/browse/23-multiple-pages/README.md | 1 + prototypes/browse/23-multiple-pages/file-state.mu | 44 ++++++ prototypes/browse/23-multiple-pages/main.mu | 52 +++++++ .../23-multiple-pages/screen-position-state.mu | 164 +++++++++++++++++++++ prototypes/browse/23/README.md | 1 - prototypes/browse/23/file-state.mu | 44 ------ prototypes/browse/23/main.mu | 52 ------- prototypes/browse/23/screen-position-state.mu | 164 --------------------- 8 files changed, 261 insertions(+), 261 deletions(-) create mode 100644 prototypes/browse/23-multiple-pages/README.md create mode 100644 prototypes/browse/23-multiple-pages/file-state.mu create mode 100644 prototypes/browse/23-multiple-pages/main.mu create mode 100644 prototypes/browse/23-multiple-pages/screen-position-state.mu delete mode 100644 prototypes/browse/23/README.md delete mode 100644 prototypes/browse/23/file-state.mu delete mode 100644 prototypes/browse/23/main.mu delete mode 100644 prototypes/browse/23/screen-position-state.mu diff --git a/prototypes/browse/23-multiple-pages/README.md b/prototypes/browse/23-multiple-pages/README.md new file mode 100644 index 00000000..d1406004 --- /dev/null +++ b/prototypes/browse/23-multiple-pages/README.md @@ -0,0 +1 @@ +Paginate to next page. diff --git a/prototypes/browse/23-multiple-pages/file-state.mu b/prototypes/browse/23-multiple-pages/file-state.mu new file mode 100644 index 00000000..35f40229 --- /dev/null +++ b/prototypes/browse/23-multiple-pages/file-state.mu @@ -0,0 +1,44 @@ +type file-state { + source: (handle buffered-file) + eof?: boolean +} + +fn init-file-state _self: (addr file-state), filename: (addr array byte) { + var self/eax: (addr file-state) <- copy _self + load-file self, filename + var eof/eax: (addr boolean) <- get self, eof? + copy-to *eof, 0 # false +} + +fn load-file _self: (addr file-state), filename: (addr array byte) { + var self/eax: (addr file-state) <- copy _self + var out/esi: (addr handle buffered-file) <- get self, source + open filename, 0, out # 0 = read mode +} + +fn next-char _self: (addr file-state) -> result/eax: byte { + var self/ecx: (addr file-state) <- copy _self + var source/eax: (addr handle buffered-file) <- get self, source + var in/eax: (addr buffered-file) <- lookup *source + result <- read-byte-buffered in + # if result == EOF, set eof? + compare result, 0xffffffff # EOF marker + { + var eof/ecx: (addr boolean) <- get self, eof? + copy-to *eof, 1 # true + } +} + +fn done-reading? _self: (addr file-state) -> result/eax: boolean { + var self/eax: (addr file-state) <- copy _self + var eof/eax: (addr boolean) <- get self, eof? + result <- copy *eof +} + +fn dump in: (addr buffered-file) { + var c/eax: byte <- read-byte-buffered in + compare c, 0xffffffff # EOF marker + break-if-= + print-byte c + loop +} diff --git a/prototypes/browse/23-multiple-pages/main.mu b/prototypes/browse/23-multiple-pages/main.mu new file mode 100644 index 00000000..cf2fef0d --- /dev/null +++ b/prototypes/browse/23-multiple-pages/main.mu @@ -0,0 +1,52 @@ +fn main args: (addr array (addr array byte)) -> exit-status/ebx: int { + # initialize fs from args[1] + var filename/eax: (addr array byte) <- first-arg args + var file-state-storage: file-state + var fs/esi: (addr file-state) <- address file-state-storage + init-file-state fs, filename + # + enable-screen-grid-mode + enable-keyboard-immediate-mode + # initialize screen state from screen size + var screen-position-state-storage: screen-position-state + var screen-position-state/eax: (addr screen-position-state) <- address screen-position-state-storage + init-screen-position-state screen-position-state + { + render fs, screen-position-state + var key/eax: byte <- read-key + compare key, 0x71 # 'q' + loop-if-!= + } + enable-keyboard-type-mode + enable-screen-type-mode + exit-status <- copy 0 +} + +fn render fs: (addr file-state), state: (addr screen-position-state) { + start-drawing state + render-normal fs, state +} + +fn render-normal fs: (addr file-state), state: (addr screen-position-state) { + { + # if done-drawing?(state) break + var done?/eax: boolean <- done-drawing? state + compare done?, 0 # false + break-if-!= + # + var c/eax: byte <- next-char fs + # if (c == EOF) break + compare c, 0xffffffff # EOF marker + break-if-= + # + add-char state, c + # + loop + } +} + +fn first-arg args-on-stack: (addr array (addr array byte)) -> out/eax: (addr array byte) { + var args/eax: (addr array (addr array byte)) <- copy args-on-stack + var result/eax: (addr addr array byte) <- index args, 1 + out <- copy *result +} diff --git a/prototypes/browse/23-multiple-pages/screen-position-state.mu b/prototypes/browse/23-multiple-pages/screen-position-state.mu new file mode 100644 index 00000000..62161108 --- /dev/null +++ b/prototypes/browse/23-multiple-pages/screen-position-state.mu @@ -0,0 +1,164 @@ +type screen-position-state { + nrows: int # const + ncols: int # const + toprow: int + botrow: int + leftcol: int + rightcol: int + row: int + col: int +} + +fn init-screen-position-state _self: (addr screen-position-state) { + # hardcoded parameters: + # top-margin + # page-margin + # page-width + var self/esi: (addr screen-position-state) <- copy _self + var nrows/eax: int <- copy 0 + var ncols/ecx: int <- copy 0 + nrows, ncols <- screen-size + var dest/edx: (addr int) <- copy 0 + # self->nrows = nrows + dest <- get self, nrows + copy-to *dest, nrows + # self->ncols = ncols + dest <- get self, ncols + copy-to *dest, ncols + # self->toprow = top-margin + dest <- get self, toprow + copy-to *dest, 2 # top-margin + # self->botrow = nrows + dest <- get self, botrow + copy-to *dest, nrows + # + start-drawing self +} + +fn start-drawing _self: (addr screen-position-state) { + var self/esi: (addr screen-position-state) <- copy _self + var tmp/eax: (addr int) <- copy 0 + var tmp2/ecx: int <- copy 0 + clear-screen + # self->leftcol = page-margin + tmp <- get self, leftcol + copy-to *tmp, 5 # left-margin + # self->rightcol = self->leftcol + page-width + tmp <- get self, rightcol + copy-to *tmp, 0x45 # left-margin + page-width + # self->row = self->toprow + tmp <- get self, toprow + tmp2 <- copy *tmp + tmp <- get self, row + copy-to *tmp, tmp2 + # self->col = self->leftcol + tmp <- get self, leftcol + tmp2 <- copy *tmp + tmp <- get self, col + copy-to *tmp, tmp2 + # + reposition-cursor self +} + +fn add-char _self: (addr screen-position-state), c: byte { +$add-char:body: { + var self/esi: (addr screen-position-state) <- copy _self + { + compare c, 0xa # newline + break-if-!= + next-line self + reposition-cursor self + break $add-char:body + } + # print c + print-byte c + # self->col++ + var tmp/eax: (addr int) <- get self, col + increment *tmp + # if (self->col > self->rightcol) next-line(self) + var tmp2/ecx: int <- copy *tmp + tmp <- get self, rightcol + compare tmp2, *tmp + { + break-if-<= + next-line self + reposition-cursor self + } +} +} + +fn next-line _self: (addr screen-position-state) { + var self/esi: (addr screen-position-state) <- copy _self + var tmp/eax: (addr int) <- copy 0 + var tmp2/ecx: int <- copy 0 + # self->col = self->leftcol + tmp <- get self, leftcol + tmp2 <- copy *tmp + tmp <- get self, col + copy-to *tmp, tmp2 + # self->row++ + tmp <- get self, row + increment *tmp + # if (self->row > self->botrow) next-page(self) + tmp2 <- copy *tmp + tmp <- get self, botrow + compare tmp2, *tmp + { + break-if-<= + next-page self + } +} + +fn next-page _self: (addr screen-position-state) { + var self/esi: (addr screen-position-state) <- copy _self + var tmp/eax: (addr int) <- copy 0 + var tmp2/ecx: int <- copy 0 + # self->leftcol = self->rightcol + page-margin + tmp <- get self, rightcol + tmp2 <- copy *tmp + tmp2 <- add 5 # page-margin + tmp <- get self, leftcol + copy-to *tmp, tmp2 + # self->rightcol = self->leftcol + page-width + tmp2 <- copy *tmp + tmp2 <- add 0x40 # page-width + tmp <- get self, rightcol + copy-to *tmp, tmp2 + # self->row = self->toprow + tmp <- get self, toprow + tmp2 <- copy *tmp + tmp <- get self, row + copy-to *tmp, tmp2 + # self->col = self->leftcol + tmp <- get self, leftcol + tmp2 <- copy *tmp + tmp <- get self, col + copy-to *tmp, tmp2 +} + +fn done-drawing? _self: (addr screen-position-state) -> result/eax: boolean { +$done-drawing?:body: { + # return self->rightcol >= self->ncols + var self/esi: (addr screen-position-state) <- copy _self + var max/ecx: (addr int) <- get self, ncols + var tmp/eax: (addr int) <- get self, rightcol + var right/eax: int <- copy *tmp + compare right, *max + { + break-if->= + result <- copy 0 # false + break $done-drawing?:body + } + { + break-if-< + result <- copy 1 # true + } +} +} + +fn reposition-cursor _self: (addr screen-position-state) { + var self/esi: (addr screen-position-state) <- copy _self + var r/eax: (addr int) <- get self, row + var c/ecx: (addr int) <- get self, col + move-cursor *r *c +} diff --git a/prototypes/browse/23/README.md b/prototypes/browse/23/README.md deleted file mode 100644 index d1406004..00000000 --- a/prototypes/browse/23/README.md +++ /dev/null @@ -1 +0,0 @@ -Paginate to next page. diff --git a/prototypes/browse/23/file-state.mu b/prototypes/browse/23/file-state.mu deleted file mode 100644 index 35f40229..00000000 --- a/prototypes/browse/23/file-state.mu +++ /dev/null @@ -1,44 +0,0 @@ -type file-state { - source: (handle buffered-file) - eof?: boolean -} - -fn init-file-state _self: (addr file-state), filename: (addr array byte) { - var self/eax: (addr file-state) <- copy _self - load-file self, filename - var eof/eax: (addr boolean) <- get self, eof? - copy-to *eof, 0 # false -} - -fn load-file _self: (addr file-state), filename: (addr array byte) { - var self/eax: (addr file-state) <- copy _self - var out/esi: (addr handle buffered-file) <- get self, source - open filename, 0, out # 0 = read mode -} - -fn next-char _self: (addr file-state) -> result/eax: byte { - var self/ecx: (addr file-state) <- copy _self - var source/eax: (addr handle buffered-file) <- get self, source - var in/eax: (addr buffered-file) <- lookup *source - result <- read-byte-buffered in - # if result == EOF, set eof? - compare result, 0xffffffff # EOF marker - { - var eof/ecx: (addr boolean) <- get self, eof? - copy-to *eof, 1 # true - } -} - -fn done-reading? _self: (addr file-state) -> result/eax: boolean { - var self/eax: (addr file-state) <- copy _self - var eof/eax: (addr boolean) <- get self, eof? - result <- copy *eof -} - -fn dump in: (addr buffered-file) { - var c/eax: byte <- read-byte-buffered in - compare c, 0xffffffff # EOF marker - break-if-= - print-byte c - loop -} diff --git a/prototypes/browse/23/main.mu b/prototypes/browse/23/main.mu deleted file mode 100644 index cf2fef0d..00000000 --- a/prototypes/browse/23/main.mu +++ /dev/null @@ -1,52 +0,0 @@ -fn main args: (addr array (addr array byte)) -> exit-status/ebx: int { - # initialize fs from args[1] - var filename/eax: (addr array byte) <- first-arg args - var file-state-storage: file-state - var fs/esi: (addr file-state) <- address file-state-storage - init-file-state fs, filename - # - enable-screen-grid-mode - enable-keyboard-immediate-mode - # initialize screen state from screen size - var screen-position-state-storage: screen-position-state - var screen-position-state/eax: (addr screen-position-state) <- address screen-position-state-storage - init-screen-position-state screen-position-state - { - render fs, screen-position-state - var key/eax: byte <- read-key - compare key, 0x71 # 'q' - loop-if-!= - } - enable-keyboard-type-mode - enable-screen-type-mode - exit-status <- copy 0 -} - -fn render fs: (addr file-state), state: (addr screen-position-state) { - start-drawing state - render-normal fs, state -} - -fn render-normal fs: (addr file-state), state: (addr screen-position-state) { - { - # if done-drawing?(state) break - var done?/eax: boolean <- done-drawing? state - compare done?, 0 # false - break-if-!= - # - var c/eax: byte <- next-char fs - # if (c == EOF) break - compare c, 0xffffffff # EOF marker - break-if-= - # - add-char state, c - # - loop - } -} - -fn first-arg args-on-stack: (addr array (addr array byte)) -> out/eax: (addr array byte) { - var args/eax: (addr array (addr array byte)) <- copy args-on-stack - var result/eax: (addr addr array byte) <- index args, 1 - out <- copy *result -} diff --git a/prototypes/browse/23/screen-position-state.mu b/prototypes/browse/23/screen-position-state.mu deleted file mode 100644 index 62161108..00000000 --- a/prototypes/browse/23/screen-position-state.mu +++ /dev/null @@ -1,164 +0,0 @@ -type screen-position-state { - nrows: int # const - ncols: int # const - toprow: int - botrow: int - leftcol: int - rightcol: int - row: int - col: int -} - -fn init-screen-position-state _self: (addr screen-position-state) { - # hardcoded parameters: - # top-margin - # page-margin - # page-width - var self/esi: (addr screen-position-state) <- copy _self - var nrows/eax: int <- copy 0 - var ncols/ecx: int <- copy 0 - nrows, ncols <- screen-size - var dest/edx: (addr int) <- copy 0 - # self->nrows = nrows - dest <- get self, nrows - copy-to *dest, nrows - # self->ncols = ncols - dest <- get self, ncols - copy-to *dest, ncols - # self->toprow = top-margin - dest <- get self, toprow - copy-to *dest, 2 # top-margin - # self->botrow = nrows - dest <- get self, botrow - copy-to *dest, nrows - # - start-drawing self -} - -fn start-drawing _self: (addr screen-position-state) { - var self/esi: (addr screen-position-state) <- copy _self - var tmp/eax: (addr int) <- copy 0 - var tmp2/ecx: int <- copy 0 - clear-screen - # self->leftcol = page-margin - tmp <- get self, leftcol - copy-to *tmp, 5 # left-margin - # self->rightcol = self->leftcol + page-width - tmp <- get self, rightcol - copy-to *tmp, 0x45 # left-margin + page-width - # self->row = self->toprow - tmp <- get self, toprow - tmp2 <- copy *tmp - tmp <- get self, row - copy-to *tmp, tmp2 - # self->col = self->leftcol - tmp <- get self, leftcol - tmp2 <- copy *tmp - tmp <- get self, col - copy-to *tmp, tmp2 - # - reposition-cursor self -} - -fn add-char _self: (addr screen-position-state), c: byte { -$add-char:body: { - var self/esi: (addr screen-position-state) <- copy _self - { - compare c, 0xa # newline - break-if-!= - next-line self - reposition-cursor self - break $add-char:body - } - # print c - print-byte c - # self->col++ - var tmp/eax: (addr int) <- get self, col - increment *tmp - # if (self->col > self->rightcol) next-line(self) - var tmp2/ecx: int <- copy *tmp - tmp <- get self, rightcol - compare tmp2, *tmp - { - break-if-<= - next-line self - reposition-cursor self - } -} -} - -fn next-line _self: (addr screen-position-state) { - var self/esi: (addr screen-position-state) <- copy _self - var tmp/eax: (addr int) <- copy 0 - var tmp2/ecx: int <- copy 0 - # self->col = self->leftcol - tmp <- get self, leftcol - tmp2 <- copy *tmp - tmp <- get self, col - copy-to *tmp, tmp2 - # self->row++ - tmp <- get self, row - increment *tmp - # if (self->row > self->botrow) next-page(self) - tmp2 <- copy *tmp - tmp <- get self, botrow - compare tmp2, *tmp - { - break-if-<= - next-page self - } -} - -fn next-page _self: (addr screen-position-state) { - var self/esi: (addr screen-position-state) <- copy _self - var tmp/eax: (addr int) <- copy 0 - var tmp2/ecx: int <- copy 0 - # self->leftcol = self->rightcol + page-margin - tmp <- get self, rightcol - tmp2 <- copy *tmp - tmp2 <- add 5 # page-margin - tmp <- get self, leftcol - copy-to *tmp, tmp2 - # self->rightcol = self->leftcol + page-width - tmp2 <- copy *tmp - tmp2 <- add 0x40 # page-width - tmp <- get self, rightcol - copy-to *tmp, tmp2 - # self->row = self->toprow - tmp <- get self, toprow - tmp2 <- copy *tmp - tmp <- get self, row - copy-to *tmp, tmp2 - # self->col = self->leftcol - tmp <- get self, leftcol - tmp2 <- copy *tmp - tmp <- get self, col - copy-to *tmp, tmp2 -} - -fn done-drawing? _self: (addr screen-position-state) -> result/eax: boolean { -$done-drawing?:body: { - # return self->rightcol >= self->ncols - var self/esi: (addr screen-position-state) <- copy _self - var max/ecx: (addr int) <- get self, ncols - var tmp/eax: (addr int) <- get self, rightcol - var right/eax: int <- copy *tmp - compare right, *max - { - break-if->= - result <- copy 0 # false - break $done-drawing?:body - } - { - break-if-< - result <- copy 1 # true - } -} -} - -fn reposition-cursor _self: (addr screen-position-state) { - var self/esi: (addr screen-position-state) <- copy _self - var r/eax: (addr int) <- get self, row - var c/ecx: (addr int) <- get self, col - move-cursor *r *c -} -- cgit 1.4.1-2-gfad0