From c20dad3534e0b1f7c2b986715cbbf3897562ade1 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Sun, 17 Jan 2021 17:55:42 -0800 Subject: [PATCH] Fix another bootloader glitch (#20) Thanks again to @Theldus for reporting this --- ape/ape.S | 4 ++-- ape/idata.internal.h | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ape/ape.S b/ape/ape.S index 6dd6e08e2..bdcfa7d1d 100644 --- a/ape/ape.S +++ b/ape/ape.S @@ -348,8 +348,8 @@ pcread: push %ax jbe 2f mov $1,%al inc %dh # ++head - cmp XLM(DRIVE_LAST_HEAD),%cx - jb 2f + cmp XLM(DRIVE_LAST_HEAD),%dh + jbe 2f xor %dh,%dh inc %cx # ++cylinder 2: ret diff --git a/ape/idata.internal.h b/ape/idata.internal.h index 4ab43b4cf..c2dc5f2fd 100644 --- a/ape/idata.internal.h +++ b/ape/idata.internal.h @@ -1,3 +1,21 @@ +/*-*- mode:unix-assembly; indent-tabs-mode:t; tab-width:8; coding:utf-8 -*-│ +│vi: set et ft=asm ts=8 sw=8 fenc=utf-8 :vi│ +╞══════════════════════════════════════════════════════════════════════════════╡ +│ Copyright 2020 Justine Alexandra Roberts Tunney │ +│ │ +│ Permission to use, copy, modify, and/or distribute this software for │ +│ any purpose with or without fee is hereby granted, provided that the │ +│ above copyright notice and this permission notice appear in all copies. │ +│ │ +│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │ +│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │ +│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │ +│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │ +│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │ +│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │ +│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │ +│ PERFORMANCE OF THIS SOFTWARE. │ +╚─────────────────────────────────────────────────────────────────────────────*/ #ifndef APE_IDATA_H_ #define APE_IDATA_H_ #ifdef __ASSEMBLER__