This is an addition to my earlier patch in ticket [bugs:#3639].
Bugs: #3639
From b5f36ff190c28f23594307228cbfa48029e0ee0b Mon Sep 17 00:00:00 2001 From: Dimitry Ishenko <dimitry.ishenko@gmail.com> Date: Wed, 8 Nov 2023 21:50:44 -0500 Subject: [PATCH] Back-port error messages from asrab 5.40 --- sdas/asrab/rabmch.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sdas/asrab/rabmch.c b/sdas/asrab/rabmch.c index 963913240..37c014854 100644 --- a/sdas/asrab/rabmch.c +++ b/sdas/asrab/rabmch.c @@ -1093,7 +1093,7 @@ VOID machine(struct mne * mp) /* LDP (mn), HL|IX|IY */ if ((t1 == S_INDM) && (t2 == S_R16)) { if ((v2 != HL) && (v2 != IX) && (v2 != IY)) { - aerr(); + xerr('a', "Second argument: must be HL, IX, or IY."); break; } if (v2 == HL) { @@ -1108,7 +1108,7 @@ VOID machine(struct mne * mp) /* LDP HL|IX|IY, (mn) */ if ((t1 == S_R16) && (t2 == S_INDM)) { if ((v1 != HL) && (v1 != IX) && (v1 != IY)) { - aerr(); + xerr('a', "First argument: must be HL, IX, or IY."); break; } if (v1 == HL) { @@ -1123,11 +1123,11 @@ VOID machine(struct mne * mp) /* LDP (HL|IX|IY), HL */ if ((t2 == S_R16) && (v2 == HL)) { if ((t1 != S_IDHL) && (t1 != S_IDIX) && (t1 != S_IDIY)) { - aerr(); + xerr('a', "First argument: must be (HL), (IX), or (IY)."); break; } if ((e1.e_base.e_ap != NULL) || (v1 != 0)) { - aerr(); + xerr('a', "First argument: (HL+D, (IX+D), and (IY+D) are invalid."); break; } if (t1 == S_IDHL) { @@ -1141,11 +1141,11 @@ VOID machine(struct mne * mp) /* LDP HL, (HL|IX|IY) */ if ((t1 == S_R16) && (v1 == HL)) { if ((t2 != S_IDHL) && (t2 != S_IDIX) && (t2 != S_IDIY)) { - aerr(); + xerr('a', "Second argument: must be (HL), (IX), or (IY)."); break; } if ((e2.e_base.e_ap != NULL) || (v2 != 0)) { - aerr(); + xerr('a', "Second argument: (HL+D, (IX+D), and (IY+D) are invalid."); break; } if (t2 == S_IDHL) { @@ -1156,7 +1156,7 @@ VOID machine(struct mne * mp) outab(op | 0x08); break; } - aerr(); + xerr('a', "Invalid Addressing Mode."); break; case R3K_INH1: -- 2.39.2
Diff:
--- old +++ new @@ -1 +1 @@ -This is an addition to my earlier patch in ticket #3639. +This is an addition to my earlier patch in ticket [bugs:#3639].
Applied in [r14657].
Commit: [r14657]
Log in to post a comment.
Diff:
Related
Bugs:
#3639Applied in [r14657].
Related
Commit: [r14657]