Hello community,
here is the log from the commit of package aranym for openSUSE:Factory checked
in at 2015-03-16 09:38:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aranym (Old)
and /work/SRC/openSUSE:Factory/.aranym.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aranym"
Changes:
--------
--- /work/SRC/openSUSE:Factory/aranym/aranym.changes 2014-10-22
16:23:51.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.aranym.new/aranym.changes 2015-03-16
09:38:39.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Mar 14 20:35:31 UTC 2015 - sch...@linux-m68k.org
+
+- cas2-emulation.patch: Fix CAS2 emulation
+
+-------------------------------------------------------------------
New:
----
cas2-emulation.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aranym.spec ++++++
--- /var/tmp/diff_new_pack.bXtNAa/_old 2015-03-16 09:38:40.000000000 +0100
+++ /var/tmp/diff_new_pack.bXtNAa/_new 2015-03-16 09:38:40.000000000 +0100
@@ -36,6 +36,7 @@
Release: 0
Source: %{name}-%{version}.tar.gz
Source1: afros812.zip
+Patch: cas2-emulation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): permissions
@@ -69,6 +70,7 @@
%prep
%setup -q -n %{name}-%{version} -a 1
+%patch -p1
# Don't remove -g from CFLAGS
sed -i -e 's,/-g,/-:,' configure.ac configure
++++++ cas2-emulation.patch ++++++
--- a/src/uae_cpu/gencpu.c
+++ b/src/uae_cpu/gencpu.c
@@ -1977,33 +1977,37 @@ static void gen_opcode (unsigned long int opcode)
printf ("\tuae_u32 rn2 = regs.regs[(extra >> 12) & 15];\n");
if (curi->size == sz_word) {
int old_brace_level = n_braces;
+ printf ("\tuae_u32 rc1 = (extra >> 16) & 7;\n");
+ printf ("\tuae_u32 rc2 = extra & 7;\n");
printf ("\tuae_u16 dst1 = get_word(rn1), dst2 = get_word(rn2);\n");
- genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, (extra >>
16) & 7)", "dst1");
+ genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, rc1)",
"dst1");
printf ("\tif (GET_ZFLG) {\n");
- genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, extra &
7)", "dst2");
+ genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, rc2)",
"dst2");
printf ("\tif (GET_ZFLG) {\n");
printf ("\tput_word(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n");
printf ("\tput_word(rn2, m68k_dreg(regs, (extra >> 6) & 7));\n");
printf ("\t}}\n");
pop_braces (old_brace_level);
printf ("\tif (! GET_ZFLG) {\n");
- printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = (m68k_dreg(regs,
(extra >> 6) & 7) & ~0xffff) | (dst2 & 0xffff);\n");
- printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = (m68k_dreg(regs,
(extra >> 22) & 7) & ~0xffff) | (dst1 & 0xffff);\n");
+ printf ("\tm68k_dreg(regs, rc2) = (m68k_dreg(regs, rc2) & ~0xffff)
| (dst2 & 0xffff);\n");
+ printf ("\tm68k_dreg(regs, rc1) = (m68k_dreg(regs, rc1) & ~0xffff)
| (dst1 & 0xffff);\n");
printf ("\t}\n");
} else {
int old_brace_level = n_braces;
+ printf ("\tuae_u32 rc1 = (extra >> 16) & 7;\n");
+ printf ("\tuae_u32 rc2 = extra & 7;\n");
printf ("\tuae_u32 dst1 = get_long(rn1), dst2 = get_long(rn2);\n");
- genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, (extra >>
16) & 7)", "dst1");
+ genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, rc1)",
"dst1");
printf ("\tif (GET_ZFLG) {\n");
- genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, extra &
7)", "dst2");
+ genflags (flag_cmp, curi->size, "newv", "m68k_dreg(regs, rc2)",
"dst2");
printf ("\tif (GET_ZFLG) {\n");
printf ("\tput_long(rn1, m68k_dreg(regs, (extra >> 22) & 7));\n");
printf ("\tput_long(rn2, m68k_dreg(regs, (extra >> 6) & 7));\n");
printf ("\t}}\n");
pop_braces (old_brace_level);
printf ("\tif (! GET_ZFLG) {\n");
- printf ("\tm68k_dreg(regs, (extra >> 6) & 7) = dst2;\n");
- printf ("\tm68k_dreg(regs, (extra >> 22) & 7) = dst1;\n");
+ printf ("\tm68k_dreg(regs, rc2) = dst2;\n");
+ printf ("\tm68k_dreg(regs, rc1) = dst1;\n");
printf ("\t}\n");
}
break;
--
2.3.3
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
