5.2.1

StjepanBM1 · Oct 24, 2023 · 52a7908 · 52a7908
1 parent 927a012
commit 52a7908
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 5 deletions.
diff --git a/bin/boot.bin b/bin/boot.bin
diff --git a/bin/kernel.bin b/bin/kernel.bin
diff --git a/bin/os1.bin b/bin/os1.bin
diff --git a/img/os1.img b/img/os1.img
diff --git a/kernel/kernel.S b/kernel/kernel.S
@@ -79,4 +79,4 @@
 
             .section    .rodata                     #   Read-only data
         _msg1:  .asciz  "\xDB\xDB\xDB OS/1 WE"      #   Boot message (2/2).
-        _mp_str_title:  .asciz  "\xDB Monitor Program for OS/1 (MP-OS/1) Version 1.0.0\r\n To start the GUI type pinb\r\n"
+        _mp_str_title:  .asciz  "\xDB Monitor Program for OS/1 (MP-OS/1) Version 1.1.0\r\n To start the GUI type pinb\r\n"
diff --git a/kernel/libk/panic.S b/kernel/libk/panic.S
@@ -160,5 +160,5 @@
         _pm_ss:  .asciz  " SS : "
 
         _pm_3:  .asciz  "\r\n\r\n OS Information:\r\n"
-        _pm_i1: .asciz  "  Kernel: v5.1.0 \"Copland\"\r\n"
-        _pm_i2: .asciz  "  OS: OS/1 Average Release 5.1.0"
+        _pm_i1: .asciz  "  Kernel: v5.2.1 \"Maine\"\r\n"
+        _pm_i2: .asciz  "  OS: OS/1 Average Release 5.2.1"
diff --git a/kernel/mp/cmd.S b/kernel/mp/cmd.S
@@ -17,5 +17,7 @@
     _mp_cmd_clear:      .asciz  "clear"         #   Clear the screen
     _mp_cmd_help:       .asciz  "help"          #   Help command
 
+    _mp_cmd_die:        .asciz  "die"           #   Cause a kernel panic
+
     #   Pinboard
     _mp_cmd_pinb:       .asciz  "pinb"          #   Start the pinboard enviroment
diff --git a/kernel/mp/main.S b/kernel/mp/main.S
@@ -108,6 +108,14 @@
             call    _strcmp
             jc      _penv
 
+            #
+            #   kernel panic
+            #
+            mov     $_input_buffer, %si
+            mov     $_mp_cmd_die,  %di
+            call    _strcmp
+            jc      _die
+
             #   Command not found? Return an "?"
             mov     $_input_buffer, %si
             call    _printk
@@ -243,6 +251,9 @@
             call     _load_B
             jmp     _input
 
+        _die:
+            jmp     _panic
+
         _help:
             mov     $_mp_str_help,  %si
             call    _printk
@@ -256,13 +267,19 @@
 
         _mp_new_line:   .asciz  "\r\n"
 
-        _mp_str_ver:    .asciz  "  Monitor Program for OS/1 (MP-OS/1) Version 1.0.0\r\n"
+        _mp_str_ver:    .asciz  "  Monitor Program for OS/1 (MP-OS/1) Version 1.1.0\r\n"
         _mp_str_mem:    .asciz  "  KB of low memory (in hex.): "
 
         _mp_prompt:     .asciz  "% "
         _mp_str_err:    .asciz  "?\r\n\n"
 
-        _mp_str_help:   .asciz  "  List of commands:\r\n    - reboot\r\n    - shutdown\r\n    - mem\r\n    - dstat\r\n    - load a\r\n    - load b\r\n    - ver\r\n    - clear\r\n    - help\r\n"
+        _mp_str_help:   .ascii  "  List of commands:\r\n"
+                        .ascii  "    - reboot\r\n    - shutdown\r\n"
+                        .ascii  "    - mem\r\n    - dstat\r\n"
+                        .ascii  "    - load a\r\n    - load b\r\n"
+                        .ascii  "    - ver\r\n    - clear\r\n"
+                        .ascii  "    - die\r\n"
+                        .asciz  "    - help\r\n"
 
             .section    .data