|
From: <sv...@va...> - 2006-02-22 13:18:21
|
Author: dirk
Date: 2006-02-22 13:18:14 +0000 (Wed, 22 Feb 2006)
New Revision: 5672
Log:
adding vm86old syscall (v5635 backport)
Modified:
branches/VALGRIND_3_1_BRANCH/coregrind/m_syswrap/syswrap-x86-linux.c
branches/VALGRIND_3_1_BRANCH/include/vki-x86-linux.h
Modified: branches/VALGRIND_3_1_BRANCH/coregrind/m_syswrap/syswrap-x86-li=
nux.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/coregrind/m_syswrap/syswrap-x86-linux.c =
2006-02-22 13:16:36 UTC (rev 5671)
+++ branches/VALGRIND_3_1_BRANCH/coregrind/m_syswrap/syswrap-x86-linux.c =
2006-02-22 13:18:14 UTC (rev 5672)
@@ -772,6 +772,8 @@
DECL_TEMPLATE(x86_linux, sys_ptrace);
DECL_TEMPLATE(x86_linux, sys_sigaction);
DECL_TEMPLATE(x86_linux, old_select);
+DECL_TEMPLATE(x86_linux, sys_vm86old);
+DECL_TEMPLATE(x86_linux, sys_vm86);
DECL_TEMPLATE(x86_linux, sys_syscall223);
=20
PRE(old_select)
@@ -1677,7 +1679,33 @@
POST_MEM_WRITE( ARG3, sizeof(struct vki_old_sigaction));
}
=20
+PRE(sys_vm86old)
+{
+ PRINT("sys_vm86old ( %p )", ARG1);
+ PRE_REG_READ1(int, "vm86old", struct vm86_struct *, info);
+ PRE_MEM_WRITE( "vm86old(info)", ARG1, sizeof(struct vki_vm86_struct))=
;
+}
=20
+POST(sys_vm86old)
+{
+ POST_MEM_WRITE( ARG1, sizeof(struct vki_vm86_struct));
+}
+
+PRE(sys_vm86)
+{
+ PRINT("sys_vm86 ( %d, %p )", ARG1,ARG2);
+ PRE_REG_READ2(int, "vm86", unsigned long, fn, struct vm86plus_struct =
*, v86);
+ if (ARG1 =3D=3D VKI_VM86_ENTER || ARG1 =3D=3D VKI_VM86_ENTER_NO_BYPAS=
S)
+ PRE_MEM_WRITE( "vm86(v86)", ARG2, sizeof(struct vki_vm86plus_struc=
t));
+}
+
+POST(sys_vm86)
+{
+ if (ARG1 =3D=3D VKI_VM86_ENTER || ARG1 =3D=3D VKI_VM86_ENTER_NO_BYPAS=
S)
+ POST_MEM_WRITE( ARG2, sizeof(struct vki_vm86plus_struct));
+}
+
+
/* ---------------------------------------------------------------
PRE/POST wrappers for x86/Linux-variant specific syscalls
------------------------------------------------------------ */
@@ -1869,7 +1897,7 @@
GENX_(__NR_iopl, sys_iopl), // 110
LINX_(__NR_vhangup, sys_vhangup), // 111
GENX_(__NR_idle, sys_ni_syscall), // 112
-//zz // (__NR_vm86old, sys_vm86old), // 113 x86/Li=
nux-only
+ PLAXY(__NR_vm86old, sys_vm86old), // 113 x86/Linux-o=
nly
GENXY(__NR_wait4, sys_wait4), // 114
//zz=20
//zz // (__NR_swapoff, sys_swapoff), // 115 */Linu=
x=20
@@ -1935,7 +1963,7 @@
LINX_(__NR_setresuid, sys_setresuid16), // 164
=20
LINXY(__NR_getresuid, sys_getresuid16), // 165
-//zz // (__NR_vm86, sys_vm86), // 166 x86/Li=
nux-only
+ PLAXY(__NR_vm86, sys_vm86), // 166 x86/Linux-o=
nly
GENX_(__NR_query_module, sys_ni_syscall), // 167
GENXY(__NR_poll, sys_poll), // 168
//zz // (__NR_nfsservctl, sys_nfsservctl), // 169 */Linu=
x
Modified: branches/VALGRIND_3_1_BRANCH/include/vki-x86-linux.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/VALGRIND_3_1_BRANCH/include/vki-x86-linux.h 2006-02-22 13:16=
:36 UTC (rev 5671)
+++ branches/VALGRIND_3_1_BRANCH/include/vki-x86-linux.h 2006-02-22 13:18=
:14 UTC (rev 5672)
@@ -783,6 +783,80 @@
#define VKI_PTRACE_SETFPXREGS 19
=20
//----------------------------------------------------------------------
+// From linux-2.6.15.4/include/asm-i386/vm86.h
+//----------------------------------------------------------------------
+
+#define VKI_VM86_PLUS_INSTALL_CHECK 0
+#define VKI_VM86_ENTER 1
+#define VKI_VM86_ENTER_NO_BYPASS 2
+#define VKI_VM86_REQUEST_IRQ 3
+#define VKI_VM86_FREE_IRQ 4
+#define VKI_VM86_GET_IRQ_BITS 5
+#define VKI_VM86_GET_AND_RESET_IRQ 6
+
+struct vki_vm86_regs {
+/*
+ * normal regs, with special meaning for the segment descriptors..
+ */
+ long ebx;
+ long ecx;
+ long edx;
+ long esi;
+ long edi;
+ long ebp;
+ long eax;
+ long __null_ds;
+ long __null_es;
+ long __null_fs;
+ long __null_gs;
+ long orig_eax;
+ long eip;
+ unsigned short cs, __csh;
+ long eflags;
+ long esp;
+ unsigned short ss, __ssh;
+/*
+ * these are specific to v86 mode:
+ */
+ unsigned short es, __esh;
+ unsigned short ds, __dsh;
+ unsigned short fs, __fsh;
+ unsigned short gs, __gsh;
+};
+
+struct vki_revectored_struct {
+ unsigned long __map[8]; /* 256 bits */
+};
+
+struct vki_vm86_struct {
+ struct vki_vm86_regs regs;
+ unsigned long flags;
+ unsigned long screen_bitmap;
+ unsigned long cpu_type;
+ struct vki_revectored_struct int_revectored;
+ struct vki_revectored_struct int21_revectored;
+};
+
+struct vki_vm86plus_info_struct {
+ unsigned long force_return_for_pic:1;
+ unsigned long vm86dbg_active:1; /* for debugger */
+ unsigned long vm86dbg_TFpendig:1; /* for debugger */
+ unsigned long unused:28;
+ unsigned long is_vm86pus:1; /* for vm86 internal use */
+ unsigned char vm86dbg_intxxtab[32]; /* for debugger */
+};
+
+struct vki_vm86plus_struct {
+ struct vki_vm86_regs regs;
+ unsigned long flags;
+ unsigned long screen_bitmap;
+ unsigned long cpu_type;
+ struct vki_revectored_struct int_revectored;
+ struct vki_revectored_struct int21_revectored;
+ struct vki_vm86plus_info_struct vm86plus;
+};
+
+//----------------------------------------------------------------------
// And that's it!
//----------------------------------------------------------------------
=20
|