summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHanno Böck <hanno@gentoo.org>2003-10-07 17:45:46 +0000
committerHanno Böck <hanno@gentoo.org>2003-10-07 17:45:46 +0000
commit7f366068c081071829fef9dd7fc55aa9c43d85f3 (patch)
tree105dded71d509b872b04b6226a293892c9cfe989 /app-emulation/dosemu/files
parentVersion bumped. (diff)
downloadgentoo-2-7f366068c081071829fef9dd7fc55aa9c43d85f3.tar.gz
gentoo-2-7f366068c081071829fef9dd7fc55aa9c43d85f3.tar.bz2
gentoo-2-7f366068c081071829fef9dd7fc55aa9c43d85f3.zip
dosemu fixes
Diffstat (limited to 'app-emulation/dosemu/files')
-rw-r--r--app-emulation/dosemu/files/digest-dosemu-1.1.99.1-r12
-rw-r--r--app-emulation/dosemu/files/dosemu_kernel26_patch51
2 files changed, 53 insertions, 0 deletions
diff --git a/app-emulation/dosemu/files/digest-dosemu-1.1.99.1-r1 b/app-emulation/dosemu/files/digest-dosemu-1.1.99.1-r1
new file mode 100644
index 000000000000..719468ad99af
--- /dev/null
+++ b/app-emulation/dosemu/files/digest-dosemu-1.1.99.1-r1
@@ -0,0 +1,2 @@
+MD5 078146d2905b1f735573aab37e3d7c4f dosemu-freedos-b9-bin.tgz 1072238
+MD5 23dc1c006707a4bfa1e7eb1e81a1f8d4 dosemu-1.1.99.1.tgz 2149504
diff --git a/app-emulation/dosemu/files/dosemu_kernel26_patch b/app-emulation/dosemu/files/dosemu_kernel26_patch
new file mode 100644
index 000000000000..f3ac22d232c7
--- /dev/null
+++ b/app-emulation/dosemu/files/dosemu_kernel26_patch
@@ -0,0 +1,51 @@
+ --- src/dosext/dpmi/dpmi.h 17 Sep 2003 14:40:54 -0000 1.1.2.2
+ +++ src/dosext/dpmi/dpmi.h 30 Sep 2003 00:36:51 -0000 1.1.2.3
+ @@ -31,8 +31,8 @@
+ /* Aargh!! Is this the only way we have to know if a signal interrupted
+ * us in DPMI server or client code? */
+ #ifdef __linux__
+ -#define UCODESEL 0x23
+ -#define UDATASEL 0x2b
+ +#define UCODESEL ucodesel
+ +#define UDATASEL udatasel
+ #endif
+
+ /* DANG_BEGIN_REMARK
+ --- src/emu-i386/cpu.c 23 Jun 2003 00:02:08 -0000 1.1.1.1
+ +++ src/emu-i386/cpu.c 30 Sep 2003 00:36:51 -0000 1.1.1.1.4.1
+ @@ -96,6 +96,12 @@
+ };
+ #endif
+
+ +/* DOSEMU code selector and data selector. Initialized at startup.
+ + * These used to be 0x23 and 0x2b, but change to 0x73 and 0x7b
+ + * in Linux kernel 2.6
+ + */
+ +unsigned short ucodesel, udatasel;
+ +
+ /*
+ * DANG_BEGIN_FUNCTION cpu_trap_0f
+ *
+ @@ -241,6 +247,12 @@
+ #else
+ REG(eflags) |= (VIF | VIP);
+ #endif
+ +
+ + /* initialize user data & code selector values (used by DPMI code) */
+ + __asm__ volatile (
+ + " movw %%cs, ucodesel\n"
+ + " movw %%ds, udatasel\n"
+ + ::);
+
+ #ifdef X86_EMULATOR
+ if (config.cpuemu) {
+ --- src/include/cpu.h 23 Jun 2003 21:13:15 -0000 1.2
+ +++ src/include/cpu.h 30 Sep 2003 00:36:51 -0000 1.2.4.1
+ @@ -301,4 +301,6 @@
+ extern int write_port_w(unsigned int value,unsigned short port);
+ int do_soft_int(int intno);
+
+ +extern unsigned short ucodesel, udatasel;
+ +
+ #endif /* CPU_H */
+ \ No newline at end of file