about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-07-28 23:54:32 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-07-28 23:58:46 -0700
commitfc951149a005ee13eef70182b375be204bea27d1 (patch)
tree35868a5c774479a8bfdc783becaa515e29d403f1
parente2f18e8866bd75669c04bff52c3f8e96d13eeb4e (diff)
downloadmu-fc951149a005ee13eef70182b375be204bea27d1.tar.gz
shell: support loading 128x128px images
I'm loading them in uncompressed ASCII format, and all streams and gap
buffers all over the place need to get massively scaled up to 256KB
capacity. But the tests don't yet run out of RAM, so I'll keep going.
-rw-r--r--shell/environment.mu8
-rw-r--r--shell/global.mu2
-rw-r--r--shell/parse.mu2
-rw-r--r--shell/read.mu4
-rw-r--r--shell/sandbox.mu2
-rw-r--r--shell/tokenize.mu2
6 files changed, 10 insertions, 10 deletions
diff --git a/shell/environment.mu b/shell/environment.mu
index 0816f41b..c3d78d86 100644
--- a/shell/environment.mu
+++ b/shell/environment.mu
@@ -950,11 +950,11 @@ fn word-at-cursor _self: (addr environment), out: (addr stream byte) {
 fn load-state _self: (addr environment), data-disk: (addr disk) {
   var self/esi: (addr environment) <- copy _self
   # data-disk -> stream
-  var s-storage: (stream byte 0x2000)  # space for 16/sectors
+  var s-storage: (stream byte 0x40000)  # space for 0x200/sectors
   var s/ebx: (addr stream byte) <- address s-storage
   draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "loading sectors from data disk", 3/fg, 0/bg
   move-cursor-to-left-margin-of-next-line 0/screen
-  load-sectors data-disk, 0/lba, 0x10/sectors, s
+  load-sectors data-disk, 0/lba, 0x200/sectors, s
 #?   draw-stream-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, s, 7/fg, 0xc5/bg=blue-bg
   # stream -> gap-buffer (HACK: we temporarily cannibalize the sandbox's gap-buffer)
   draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "parsing", 3/fg, 0/bg
@@ -1034,11 +1034,11 @@ fn store-state data-disk: (addr disk), sandbox: (addr sandbox), globals: (addr g
     break-if-!=
     return
   }
-  var stream-storage: (stream byte 0x2000)  # space enough for 16/sectors
+  var stream-storage: (stream byte 0x40000)  # space enough for 0x200/sectors
   var stream/edi: (addr stream byte) <- address stream-storage
   write stream, "(\n"
   write-globals stream, globals
   write-sandbox stream, sandbox
   write stream, ")\n"
-  store-sectors data-disk, 0/lba, 0x10/sectors, stream
+  store-sectors data-disk, 0/lba, 0x200/sectors, stream
 }
diff --git a/shell/global.mu b/shell/global.mu
index cd5a4244..7cf06d6d 100644
--- a/shell/global.mu
+++ b/shell/global.mu
@@ -57,7 +57,7 @@ fn load-globals in: (addr handle cell), self: (addr global-table) {
     var value-gap-buffer-ah/edi: (addr handle gap-buffer) <- address value-gap-buffer-storage
     allocate value-gap-buffer-ah
     var value-gap-buffer/eax: (addr gap-buffer) <- lookup *value-gap-buffer-ah
-    initialize-gap-buffer value-gap-buffer, 0x1000/4KB
+    initialize-gap-buffer value-gap-buffer, 0x40000/256KB
     load-gap-buffer-from-stream value-gap-buffer, value-data
     load-lexical-scope value-gap-buffer-ah, self
     loop
diff --git a/shell/parse.mu b/shell/parse.mu
index d888f56b..3bdc72b6 100644
--- a/shell/parse.mu
+++ b/shell/parse.mu
@@ -267,7 +267,7 @@ fn parse-atom _curr-token: (addr token), _out: (addr handle cell), trace: (addr
       compare should-trace?, 0/false
     }
     break-if-=
-    var stream-storage: (stream byte 0x400)
+    var stream-storage: (stream byte 0x40000)
     var stream/ecx: (addr stream byte) <- address stream-storage
     write stream, "=> symbol "
     var nested-trace-storage: trace
diff --git a/shell/read.mu b/shell/read.mu
index 1066d215..4e66fd7b 100644
--- a/shell/read.mu
+++ b/shell/read.mu
@@ -1,6 +1,6 @@
 fn read-cell in: (addr gap-buffer), out: (addr handle cell), trace: (addr trace) {
   # eagerly tokenize everything so that the phases are easier to see in the trace
-  var tokens-storage: (stream token 0x400)
+  var tokens-storage: (stream token 0x10000)
   var tokens/edx: (addr stream token) <- address tokens-storage
   tokenize in, tokens, trace
   var error?/eax: boolean <- has-errors? trace
@@ -10,7 +10,7 @@ fn read-cell in: (addr gap-buffer), out: (addr handle cell), trace: (addr trace)
     return
   }
   # insert more parens based on indentation
-  var parenthesized-tokens-storage: (stream token 0x400)
+  var parenthesized-tokens-storage: (stream token 0x10000)
   var parenthesized-tokens/ecx: (addr stream token) <- address parenthesized-tokens-storage
   parenthesize tokens, parenthesized-tokens, trace
   var error?/eax: boolean <- has-errors? trace
diff --git a/shell/sandbox.mu b/shell/sandbox.mu
index eb18990c..47086a1f 100644
--- a/shell/sandbox.mu
+++ b/shell/sandbox.mu
@@ -14,7 +14,7 @@ fn initialize-sandbox _self: (addr sandbox), fake-screen-width: int, fake-screen
   var data-ah/eax: (addr handle gap-buffer) <- get self, data
   allocate data-ah
   var data/eax: (addr gap-buffer) <- lookup *data-ah
-  initialize-gap-buffer data, 0x2000/default-gap-buffer-size=8KB
+  initialize-gap-buffer data, 0x40000/default-gap-buffer-size=256KB
   #
   var value-ah/eax: (addr handle stream byte) <- get self, value
   populate-stream value-ah, 0x1000/4KB
diff --git a/shell/tokenize.mu b/shell/tokenize.mu
index 2ba391a9..fba26b74 100644
--- a/shell/tokenize.mu
+++ b/shell/tokenize.mu
@@ -724,7 +724,7 @@ fn next-balanced-stream-token in: (addr gap-buffer), _out: (addr token), trace:
   var bracket-count: int
   # stream tokens contain whole function definitions on boot, so we always
   # give them plenty of space
-  populate-stream out-data-ah, 0x400/max-definition-size=1KB
+  populate-stream out-data-ah, 0x40000/max-definition-size=256KB
   var _out-data/eax: (addr stream byte) <- lookup *out-data-ah
   var out-data/edi: (addr stream byte) <- copy _out-data
   $next-balanced-stream-token:loop: {
ef='#n409'>409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704