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
6d931c27
Commit
6d931c27
authored
May 02, 2024
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ntdll: Build __chkstk as x86-64 code on ARM64EC.
Based on a patch by Jacek Caban.
parent
8331003f
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
20 deletions
+17
-20
signal_arm64ec.c
dlls/ntdll/signal_arm64ec.c
+0
-11
signal_x86_64.c
dlls/ntdll/signal_x86_64.c
+17
-9
No files found.
dlls/ntdll/signal_arm64ec.c
View file @
6d931c27
...
@@ -2324,17 +2324,6 @@ static void __attribute__((naked)) arm64x_check_call(void)
...
@@ -2324,17 +2324,6 @@ static void __attribute__((naked)) arm64x_check_call(void)
/**************************************************************************
/**************************************************************************
* __chkstk (NTDLL.@)
*
* Supposed to touch all the stack pages, but we shouldn't need that.
*/
void
__attribute__
((
naked
))
__chkstk
(
void
)
{
asm
(
"ret"
);
}
/**************************************************************************
* __chkstk_arm64ec (NTDLL.@)
* __chkstk_arm64ec (NTDLL.@)
*
*
* Supposed to touch all the stack pages, but we shouldn't need that.
* Supposed to touch all the stack pages, but we shouldn't need that.
...
...
dlls/ntdll/signal_x86_64.c
View file @
6d931c27
...
@@ -18,7 +18,11 @@
...
@@ -18,7 +18,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
*/
#if defined(__x86_64__) && !defined(__arm64ec__)
#if 0
#pragma makedep arm64ec_x64
#endif
#ifdef __x86_64__
#include <stdlib.h>
#include <stdlib.h>
#include <stdarg.h>
#include <stdarg.h>
...
@@ -34,6 +38,17 @@
...
@@ -34,6 +38,17 @@
#include "wine/debug.h"
#include "wine/debug.h"
#include "ntsyscalls.h"
#include "ntsyscalls.h"
/**************************************************************************
* __chkstk (NTDLL.@)
*
* Supposed to touch all the stack pages, but we shouldn't need that.
*/
__ASM_GLOBAL_FUNC
(
__chkstk
,
"ret"
);
#ifndef __arm64ec_x64__
WINE_DEFAULT_DEBUG_CHANNEL
(
seh
);
WINE_DEFAULT_DEBUG_CHANNEL
(
seh
);
WINE_DECLARE_DEBUG_CHANNEL
(
relay
);
WINE_DECLARE_DEBUG_CHANNEL
(
relay
);
...
@@ -81,14 +96,6 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX
...
@@ -81,14 +96,6 @@ static NTSTATUS virtual_unwind( ULONG type, DISPATCHER_CONTEXT *dispatch, CONTEX
}
}
/**************************************************************************
* __chkstk (NTDLL.@)
*
* Supposed to touch all the stack pages, but we shouldn't need that.
*/
__ASM_GLOBAL_FUNC
(
__chkstk
,
"ret"
);
/***********************************************************************
/***********************************************************************
* RtlCaptureContext (NTDLL.@)
* RtlCaptureContext (NTDLL.@)
*/
*/
...
@@ -1043,4 +1050,5 @@ __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret"
...
@@ -1043,4 +1050,5 @@ __ASM_GLOBAL_FUNC( DbgUserBreakPoint, "int $3; ret"
"
\n\t
nop; nop; nop; nop; nop; nop; nop; nop"
"
\n\t
nop; nop; nop; nop; nop; nop; nop; nop"
"
\n\t
nop; nop; nop; nop; nop; nop"
);
"
\n\t
nop; nop; nop; nop; nop; nop"
);
#endif
/* __arm64ec_x64__ */
#endif
/* __x86_64__ */
#endif
/* __x86_64__ */
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