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: Thomas Huth <th.huth@xxxxxxxxx>
- Date: Sat, 26 Mar 2022 15:34:39 +0000
- Dkim-signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1648308883; bh=6unsGxfQV2x9i5jH7xTzBRw84kKXsCJf74JG/Spbuss=; h=Date:From:To:Subject:From; b=CVV+kbnyBHiOWM+Q2hVjJ3rGolLRYK3oCeOGOhZdAfG/6YsE9QbrCDNQVlK+eQ89H Gfm2D4UIYJQ6IJxtUrrDilj0y3vSMBNgfXhILx+ED019WloiS6+uYc4VSW7paQHZMj fOD1NpK68WV0jW6ciJVr6aKj5IzK7fy6LqADWfthDxcFXfPXCMYE9vDvuxDK7zTyxu /yv7LoeJ5K2KXea2TNp7Mj/hnNUzX9Kg9Pu5H0OVWff9iU140goWcEXO5yuG+jwqZ6 Vq1A7C6bli06iRftFrfSraAkoOsN+KVZ4L8catWu5qfC7Vtq5A/dqs4UxxeJlSvVwu +6GYHgln92r7A==
Hi!
I just noticed this hasn't been fixed in Hatari yet, so I went ahead now
and adapted the patch (there were some additional spots missing). Thank you
for reporting it!
Thomas
Am Tue, 9 Mar 2021 18:47:31 +0100
schrieb Andreas Grabher <andreas_g86@xxxxxxxxxx>:
> 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 ?
> >
> >
> >
>
>
>