Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
df8d907f
Commit
df8d907f
authored
Feb 12, 2024
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll/tests: Don't use x86-64 assembly on ARM64EC.
parent
de492f9a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
exception.c
dlls/ntdll/tests/exception.c
+16
-2
time.c
dlls/ntdll/tests/time.c
+2
-2
No files found.
dlls/ntdll/tests/exception.c
View file @
df8d907f
...
...
@@ -3303,7 +3303,6 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame,
{
const
struct
exception
*
except
=
*
(
const
struct
exception
**
)(
dispatcher
->
HandlerData
);
unsigned
int
i
,
parameter_count
,
entry
=
except
-
exceptions
;
USHORT
ds
,
es
,
fs
,
gs
,
ss
;
got_exception
++
;
winetest_push_context
(
"%u: %lx"
,
entry
,
rec
->
ExceptionCode
);
...
...
@@ -3317,6 +3316,9 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame,
(
rec
->
ExceptionCode
==
STATUS_BREAKPOINT
&&
rec
->
ExceptionAddress
==
(
char
*
)
context
->
Rip
+
1
),
"Unexpected exception address %p/%p
\n
"
,
rec
->
ExceptionAddress
,
(
char
*
)
context
->
Rip
);
#ifndef __arm64ec__
{
USHORT
ds
,
es
,
fs
,
gs
,
ss
;
__asm__
volatile
(
"movw %%ds,%0"
:
"=g"
(
ds
)
);
__asm__
volatile
(
"movw %%es,%0"
:
"=g"
(
es
)
);
__asm__
volatile
(
"movw %%fs,%0"
:
"=g"
(
fs
)
);
...
...
@@ -3335,6 +3337,8 @@ static DWORD WINAPI handler( EXCEPTION_RECORD *rec, ULONG64 frame,
"gs %#x does not match ss %#x
\n
"
,
context
->
SegGs
,
context
->
SegSs
);
todo_wine
ok
(
context
->
SegFs
&&
context
->
SegFs
!=
context
->
SegSs
,
"got fs %#x
\n
"
,
context
->
SegFs
);
}
#endif
if
(
except
->
status
==
STATUS_BREAKPOINT
&&
is_wow64
)
parameter_count
=
1
;
...
...
@@ -3604,7 +3608,6 @@ static void test_exceptions(void)
{
CONTEXT
ctx
;
NTSTATUS
res
;
USHORT
ds
,
es
,
fs
,
gs
,
ss
;
struct
dbgreg_test
dreg_test
;
/* test handling of debug registers */
...
...
@@ -3657,6 +3660,9 @@ static void test_exceptions(void)
/* test int3 handling */
run_exception_test
(
int3_handler
,
NULL
,
int3_code
,
sizeof
(
int3_code
),
0
);
#ifndef __arm64ec__
{
USHORT
ds
,
es
,
fs
,
gs
,
ss
;
/* test segment registers */
ctx
.
ContextFlags
=
CONTEXT_CONTROL
|
CONTEXT_SEGMENTS
;
res
=
pNtGetContextThread
(
GetCurrentThread
(),
&
ctx
);
...
...
@@ -3696,6 +3702,8 @@ static void test_exceptions(void)
ok
(
ctx
.
SegEs
==
ctx
.
SegSs
,
"wrong es %04x / %04x
\n
"
,
ctx
.
SegEs
,
ctx
.
SegSs
);
ok
(
ctx
.
SegFs
!=
ctx
.
SegSs
,
"wrong fs %04x / %04x
\n
"
,
ctx
.
SegFs
,
ctx
.
SegSs
);
ok
(
ctx
.
SegGs
==
ctx
.
SegSs
,
"wrong gs %04x / %04x
\n
"
,
ctx
.
SegGs
,
ctx
.
SegSs
);
}
#endif
}
static
DWORD
WINAPI
simd_fault_handler
(
EXCEPTION_RECORD
*
rec
,
ULONG64
frame
,
...
...
@@ -4218,8 +4226,12 @@ static void test_debugger(DWORD cont_status, BOOL with_WaitForDebugEventEx)
}
else
if
(
stage
==
STAGE_SEGMENTS
)
{
#ifdef __arm64ec__
USHORT
ss
=
0x2b
;
#else
USHORT
ss
;
__asm__
(
"movw %%ss,%0"
:
"=r"
(
ss
)
);
#endif
ok
(
ctx
.
SegSs
==
ss
,
"wrong ss %04x / %04x
\n
"
,
ctx
.
SegSs
,
ss
);
ok
(
ctx
.
SegDs
==
ctx
.
SegSs
,
"wrong ds %04x / %04x
\n
"
,
ctx
.
SegDs
,
ctx
.
SegSs
);
ok
(
ctx
.
SegEs
==
ctx
.
SegSs
,
"wrong es %04x / %04x
\n
"
,
ctx
.
SegEs
,
ctx
.
SegSs
);
...
...
@@ -11519,6 +11531,7 @@ static void test_extended_context(void)
enabled_features
=
pRtlGetEnabledExtendedFeatures
(
~
(
ULONG64
)
0
);
#ifndef __arm64ec__
if
(
enabled_features
)
{
int
regs
[
4
];
...
...
@@ -11527,6 +11540,7 @@ static void test_extended_context(void)
xsaveopt_enabled
=
regs
[
0
]
&
1
;
compaction_enabled
=
regs
[
0
]
&
2
;
}
#endif
/* Test context manipulation functions. */
length
=
0xdeadbeef
;
...
...
dlls/ntdll/tests/time.c
View file @
df8d907f
...
...
@@ -125,7 +125,7 @@ static void test_NtQueryPerformanceCounter(void)
ok
(
status
==
STATUS_SUCCESS
,
"expected STATUS_SUCCESS, got %08lx
\n
"
,
status
);
}
#if
defined(__i386__) || defined(__x86_64
__)
#if
(defined(__i386__) || defined(__x86_64__)) && !defined(__arm64ec
__)
struct
hypervisor_shared_data
{
...
...
@@ -494,7 +494,7 @@ START_TEST(time)
test_NtQueryPerformanceCounter
();
test_RtlQueryTimeZoneInformation
();
test_user_shared_data_time
();
#if
defined(__i386__) || defined(__x86_64
__)
#if
(defined(__i386__) || defined(__x86_64__)) && !defined(__arm64ec
__)
test_RtlQueryPerformanceCounter
();
#endif
test_TimerResolution
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment