about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-05-07 12:27:20 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-05-07 12:27:20 -0700
commit150db8d56a399a9f5a3bb0a15b2ae4af612350a5 (patch)
tree2fe8ad6e924948eeb02c659a267478d157a0df0c
parentdd192dd52c755f40e09d7d60a95fbf57faa9b669 (diff)
downloadmu-150db8d56a399a9f5a3bb0a15b2ae4af612350a5.tar.gz
some boot-time heartbeat messages
This will help us with some common debug scenarios.
-rw-r--r--shell/global.mu12
-rw-r--r--shell/main.mu9
2 files changed, 20 insertions, 1 deletions
diff --git a/shell/global.mu b/shell/global.mu
index 4cf17de3..219ac5e3 100644
--- a/shell/global.mu
+++ b/shell/global.mu
@@ -64,7 +64,7 @@ fn initialize-globals _self: (addr global-table) {
 }
 
 fn load-globals in: (addr handle cell), self: (addr global-table) {
-#?   draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "a", 2/fg 0/bg
+  draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "loading globals:", 3/fg, 0/bg
   var remaining-ah/esi: (addr handle cell) <- copy in
   {
     var _remaining/eax: (addr cell) <- lookup *remaining-ah
@@ -76,6 +76,15 @@ fn load-globals in: (addr handle cell), self: (addr global-table) {
     var curr-ah/eax: (addr handle cell) <- get remaining, left
     var curr/eax: (addr cell) <- lookup *curr-ah
     remaining-ah <- get remaining, right
+    {
+      draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, " ", 2/fg 0/bg
+      var name-ah/ecx: (addr handle cell) <- get curr, left
+      var name/eax: (addr cell) <- lookup *name-ah
+      var name-data-ah/eax: (addr handle stream byte) <- get name, text-data
+      var name-data/eax: (addr stream byte) <- lookup *name-data-ah
+      rewind-stream name-data
+      draw-stream-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, name-data, 3/fg, 0/bg
+    }
     var value-ah/eax: (addr handle cell) <- get curr, right
     var value/eax: (addr cell) <- lookup *value-ah
     var value-data-ah/eax: (addr handle stream byte) <- get value, text-data
@@ -93,6 +102,7 @@ fn load-globals in: (addr handle cell), self: (addr global-table) {
 #?     draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "y", 2/fg 0/bg
     loop
   }
+  move-cursor-to-left-margin-of-next-line 0/screen
 #?   abort "zz"
 }
 
diff --git a/shell/main.mu b/shell/main.mu
index 2c47e4f2..16e23c7a 100644
--- a/shell/main.mu
+++ b/shell/main.mu
@@ -81,15 +81,23 @@ fn load-state data-disk: (addr disk), _sandbox: (addr sandbox), globals: (addr g
   # data-disk -> stream
   var s-storage: (stream byte 0x1000)  # space for 8/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, 8/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
+  draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "parsing", 3/fg, 0/bg
+  move-cursor-to-left-margin-of-next-line 0/screen
   load-gap-buffer-from-stream data, s
+  draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "  into gap buffer", 3/fg, 0/bg
+  move-cursor-to-left-margin-of-next-line 0/screen
   clear-stream s
   # read: gap-buffer -> cell
   var initial-root-storage: (handle cell)
   var initial-root/ecx: (addr handle cell) <- address initial-root-storage
   read-cell data, initial-root, 0/no-trace
+  draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "  into s-expressions", 3/fg, 0/bg
+  move-cursor-to-left-margin-of-next-line 0/screen
   clear-gap-buffer data
   #
   {
@@ -113,6 +121,7 @@ fn load-state data-disk: (addr disk), _sandbox: (addr sandbox), globals: (addr g
     load-globals globals-cell-ah, globals
   }
   # sandbox = assoc(initial-root, 'sandbox)
+  draw-text-wrapping-right-then-down-from-cursor-over-full-screen 0/screen, "loading sandbox", 3/fg, 0/bg
   var sandbox-literal-storage: (handle cell)
   var sandbox-literal-ah/eax: (addr handle cell) <- address sandbox-literal-storage
   new-symbol sandbox-literal-ah, "sandbox"
296' href='#n296'>296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 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 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767