| Re: [hatari-devel] Portability patch |
[ Thread Index |
Date Index
| More lists.tuxfamily.org/hatari-devel Archives
]
- To: hatari-devel@xxxxxxxxxxxxxxxxxxx
- Subject: Re: [hatari-devel] Portability patch
- From: Andreas Grabher <andreas_g86@xxxxxxxxxx>
- Date: Tue, 9 Mar 2021 18:47:31 +0100
- Cc: Toni Wilen <twilen@xxxxxxxxxx>
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=icloud.com; s=1a1hai; t=1615312048; bh=H6rjByJkl2+peI5yd25FCwiugKHkSkDbdgh4BW3ivxs=; h=Content-Type:Mime-Version:Subject:From:Date:Message-Id:To; b=1Upb1tcxdE7kl5VIplVveWbehnU9Y0gXVXbeE/3oAvZs+vCspjWYyNO2PtGS5HiAO KlH6+DfPPZPkSe5CLdiSZJHJWVB30zk2l/EgtmPasWhtf5d8VG59b0HC402BVKGWpy PqP4d+cZg0bEbNg+vA01yd8/tdLr/HBdgHzRAuFUZ5Y+Hz7W69yVQYa+jVdfScJnfJ B89d4oW3GxJIEpdXGl/OV8ulWOQjlKyPebrcdEbkulkDbYLTqTEFniLRt21y3f40mE mmTAJ40hXQYVesIuaBLSiJy0q5TBUzzDl706bQ80HATrrkqwB78Vw8rYEvLyKXvD28 9ti880QBbm2VQ==
This is the patch (only for 68030 and 68040 as Previous does not use other CPUs):
diff -ruB /Users/andi/Desktop/previous-code-r969-branches-branch_softfloat/src/cpu/newcpu.c /Users/andi/Desktop/Previous_Latest/src/cpu/newcpu.c
--- /Users/andi/Desktop/previous-code-r969-branches-branch_softfloat/src/cpu/newcpu.c 2021-03-06 07:25:26.000000000 +0100
+++ /Users/andi/Desktop/Previous_Latest/src/cpu/newcpu.c 2021-03-09 18:42:21.000000000 +0100
@@ -6064,8 +6064,10 @@
#endif
if (regs.spcflags) {
- if (do_specialties (cpu_cycles))
+ if (do_specialties (cpu_cycles)) {
+ STOPTRY;
return;
+ }
}
}
} CATCH (prb) {
@@ -6192,8 +6194,10 @@
lastintr = intr;
#endif
if (regs.spcflags) {
- if (do_specialties (cpu_cycles))
+ if (do_specialties (cpu_cycles)) {
+ STOPTRY;
return;
+ }
}
}
> Am 09.03.2021 um 13:55 schrieb Nicolas Pomarède <npomarede@xxxxxxxxxxxx>:
>
> Le 09/03/2021 à 10:59, Andreas Grabher a écrit :
>> There is a bug in the run-loops affecting the C implementation of try/catch:
>> Before returning after non-zero do_specialties() we need to call STOPTRY. That call is missing. C++ WinUAE is not affected.
>
> Hi
>
> at which line in the source ?
>
>
>