|
From: <sv...@va...> - 2005-07-06 20:03:46
|
Author: sewardj
Date: 2005-07-06 21:03:43 +0100 (Wed, 06 Jul 2005)
New Revision: 4119
Log:
smc1 is an x86-specific test; re-home it accordingly. (How did this
one evade detection for so long?)
Added:
trunk/none/tests/x86/smc1.c
trunk/none/tests/x86/smc1.stderr.exp
trunk/none/tests/x86/smc1.stdout.exp
trunk/none/tests/x86/smc1.vgtest
Removed:
trunk/none/tests/smc1.c
trunk/none/tests/smc1.stderr.exp
trunk/none/tests/smc1.stdout.exp
trunk/none/tests/smc1.vgtest
Modified:
trunk/none/tests/Makefile.am
trunk/none/tests/x86/Makefile.am
Modified: trunk/none/tests/Makefile.am
=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
--- trunk/none/tests/Makefile.am 2005-07-06 19:46:48 UTC (rev 4118)
+++ trunk/none/tests/Makefile.am 2005-07-06 20:03:43 UTC (rev 4119)
@@ -87,7 +87,6 @@
shortpush.stderr.exp shortpush.vgtest \
shorts.stderr.exp shorts.vgtest \
sigstackgrowth.stdout.exp sigstackgrowth.stderr.exp sigstackgrowth.vgte=
st \
- smc1.stderr.exp smc1.stdout.exp smc1.vgtest \
stackgrowth.stdout.exp stackgrowth.stderr.exp stackgrowth.vgtest \
syscall-restart1.vgtest syscall-restart1.stdout.exp syscall-restart1.st=
derr.exp \
syscall-restart2.vgtest syscall-restart2.stdout.exp syscall-restart2.st=
derr.exp \
@@ -115,7 +114,7 @@
pth_stackalign \
rcrl readline1 res_search resolv \
rlimit_nofile selfrun sem semlimit sha1_test \
- shortpush shorts stackgrowth sigstackgrowth smc1 susphello \
+ shortpush shorts stackgrowth sigstackgrowth susphello \
syscall-restart1 syscall-restart2 system \
thread-exits threaded-fork threadederrno \
tls tls.so tls2.so yield vgprintf \
Deleted: trunk/none/tests/smc1.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
--- trunk/none/tests/smc1.c 2005-07-06 19:46:48 UTC (rev 4118)
+++ trunk/none/tests/smc1.c 2005-07-06 20:03:43 UTC (rev 4119)
@@ -1,77 +0,0 @@
-
-/* Test Heimdall's ability to spot writes to code which has been
- translated, and discard the out-of-date translations.
-
- CORRECT output is
-
- in p 0
- in q 1
- in p 2
- in q 3
- in p 4
- in q 5
- in p 6
- in q 7
- in p 8
- in q 9
-
- WRONG output (if you fail to spot code-writes to code[0 .. 4]) is
-
- in p 0
- in p 1
- in p 2
- in p 3
- in p 4
- in p 5
- in p 6
- in p 7
- in p 8
- in p 9
-*/
-
-#include <stdio.h>
-#include "valgrind.h"
-
-typedef unsigned int Addr;
-typedef unsigned char UChar;
-
-void q ( int n )
-{
- printf("in q %d\n", n);
-}
-
-void p ( int n )
-{
- printf("in p %d\n", n);
-}
-
-UChar code[10];
-
-/* Make `code' be JMP-32 dest */
-void set_dest ( Addr dest )
-{
- unsigned int delta;
- delta =3D dest - ((Addr)(&code[0]));
- delta -=3D 5;
- =20
- code[0] =3D 0xE9; /* JMP d32 */
- code[1] =3D (delta & 0xFF);
- code[2] =3D ((delta >> 8) & 0xFF);
- code[3] =3D ((delta >> 16) & 0xFF);
- code[4] =3D ((delta >> 24) & 0xFF);
-
- /* XXX this should be automatic */
- VALGRIND_DISCARD_TRANSLATIONS(code, sizeof(code));
-}
-
-int main ( void )
-{
- int i;
- for (i =3D 0; i < 10; i +=3D 2) {
- set_dest ( (Addr)&p );
- ( (void (*)(int)) (&code[0]) ) (i);
- set_dest ( (Addr)&q );
- ( (void (*)(int)) (&code[0]) ) (i+1);
- }
- return 0;
-}
Deleted: trunk/none/tests/smc1.stderr.exp
=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
--- trunk/none/tests/smc1.stderr.exp 2005-07-06 19:46:48 UTC (rev 4118)
+++ trunk/none/tests/smc1.stderr.exp 2005-07-06 20:03:43 UTC (rev 4119)
@@ -1,2 +0,0 @@
-
-
Deleted: trunk/none/tests/smc1.stdout.exp
=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
--- trunk/none/tests/smc1.stdout.exp 2005-07-06 19:46:48 UTC (rev 4118)
+++ trunk/none/tests/smc1.stdout.exp 2005-07-06 20:03:43 UTC (rev 4119)
@@ -1,10 +0,0 @@
-in p 0
-in q 1
-in p 2
-in q 3
-in p 4
-in q 5
-in p 6
-in q 7
-in p 8
-in q 9
Deleted: trunk/none/tests/smc1.vgtest
=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
--- trunk/none/tests/smc1.vgtest 2005-07-06 19:46:48 UTC (rev 4118)
+++ trunk/none/tests/smc1.vgtest 2005-07-06 20:03:43 UTC (rev 4119)
@@ -1 +0,0 @@
-prog: smc1
Modified: trunk/none/tests/x86/Makefile.am
=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
--- trunk/none/tests/x86/Makefile.am 2005-07-06 19:46:48 UTC (rev 4118)
+++ trunk/none/tests/x86/Makefile.am 2005-07-06 20:03:43 UTC (rev 4119)
@@ -17,12 +17,13 @@
$(addsuffix .vgtest,$(INSN_TESTS)) \
pushpopseg.stderr.exp pushpopseg.stdout.exp pushpopseg.vgtest \
seg_override.stderr.exp seg_override.stdout.exp seg_override.vgtest \
- sigcontext.stdout.exp sigcontext.stderr.exp sigcontext.vgtest
+ sigcontext.stdout.exp sigcontext.stderr.exp sigcontext.vgtest \
+ smc1.stderr.exp smc1.stdout.exp smc1.vgtest
=20
check_PROGRAMS =3D \
badseg bt_everything bt_literal cpuid fpu_lazy_eflags \
getseg $(INSN_TESTS) \
- int pushpopseg seg_override sigcontext
+ int pushpopseg seg_override sigcontext smc1
=20
AM_CFLAGS =3D $(WERROR) -Winline -Wall -Wshadow \
-g -I$(top_srcdir)/include \
Copied: trunk/none/tests/x86/smc1.c (from rev 4114, trunk/none/tests/smc1=
.c)
Copied: trunk/none/tests/x86/smc1.stderr.exp (from rev 4114, trunk/none/t=
ests/smc1.stderr.exp)
Copied: trunk/none/tests/x86/smc1.stdout.exp (from rev 4114, trunk/none/t=
ests/smc1.stdout.exp)
Copied: trunk/none/tests/x86/smc1.vgtest (from rev 4114, trunk/none/tests=
/smc1.vgtest)
|