about summary refs log tree commit diff stats
path: root/baremetal
diff options
context:
space:
mode:
authorKartik Agaram <vc@akkartik.com>2021-01-22 16:52:44 -0800
committerKartik Agaram <vc@akkartik.com>2021-01-22 16:52:44 -0800
commitc316a11ffa6fa184c9c62dc6fccbc0a6aa6c8f63 (patch)
tree1d4b6fb215639d5d58fc9d598b5fc4ae6983ee17 /baremetal
parentdbf434f09660263aa989e9fc46789f5aea12618e (diff)
downloadmu-c316a11ffa6fa184c9c62dc6fccbc0a6aa6c8f63.tar.gz
7539 - baremetal: handle unrecognized keys
Diffstat (limited to 'baremetal')
-rw-r--r--baremetal/boot.hex18
1 files changed, 11 insertions, 7 deletions
diff --git a/baremetal/boot.hex b/baremetal/boot.hex
index 1fc316c5..c6f8273b 100644
--- a/baremetal/boot.hex
+++ b/baremetal/boot.hex
@@ -233,7 +233,7 @@ e9 fb ff  # loop forever
   # if (status & 0x1) == 0, return
   24 01  # al <- and 0x1
   3c 00  # compare al, 0
-  74 35  # jump to epilogue if = [label]
+  74 39  # jump to epilogue if = [label]
 # 120:
   # if keyboard buffer is full, return
   31 c9  # ecx <- xor ecx;  11/direct 001/r32/ecx 001/rm32/ecx
@@ -248,7 +248,7 @@ e9 fb ff  # loop forever
   # . if (al != 0) return
   3c 00  # compare al, 0
 # 130:
-  75 23  # jump to epilogue if != [label]
+  75 27  # jump to epilogue if != [label]
   # read keycode into al
   e4 60  # al <- port 0x60
   # if (al & 0x80) a key is being lifted; return
@@ -256,17 +256,21 @@ e9 fb ff  # loop forever
   24 80  # al <- and 0x80
   3c 00  # compare al, 0
   58  # pop to eax (without touching flags)
-  75 19  # jump to epilogue if != [label]
+  75 1d  # jump to epilogue if != [label]
 # 13c:
   # al <- *(keyboard normal map + eax)
   8a  # copy m8 at rm32 to r8
     80  # 10/mod/*+disp32 000/r8/al 000/rm32/eax
     00 80 00 00  # disp32 [label]
+  # if there's no character mapping, return
+  3c 00  # compare al, 0
+  74 13  # jump to epilogue if = [label]
+# 146:
   # store al in keyboard buffer
   88  # copy r8 to m8 at r32
     81  # 10/mod/*+disp32 000/r8/al 001/rm32/ecx
     d0 7d 00 00  # disp32 [label]
-# 148:
+# 14c:
   # increment index
   fe  # increment byte
     05  # 00/mod/indirect 000/subop/increment 101/rm32/use-disp32
@@ -276,15 +280,15 @@ e9 fb ff  # loop forever
     25  # 00/mod/indirect 100/subop/and 101/rm32/use-disp32
     c8 7d 00 00  # disp32 [label]
     0f  # imm8
-# 155:
+# 159:
   # epilogue
   61  # pop all registers
   fb  # enable interrupts
   cf  # iret
 
 # padding
-# 158:
-                        00 00 00 00 00 00 00 00
+# 15c:
+                                    00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 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