Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RISC-V] Fix build error #84910

Merged
merged 1 commit into from
Apr 17, 2023
Merged

[RISC-V] Fix build error #84910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/coreclr/debug/inc/dbgtargetcontext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ typedef DECLSPEC_ALIGN(16) struct {
//

/* +0x000 */ DWORD ContextFlags;
/* +0x004 */ DWORD Fcsr;

//
// Integer registers
Expand Down
5 changes: 2 additions & 3 deletions src/coreclr/inc/crosscomp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,8 +525,7 @@ typedef struct _T_KNONVOLATILE_CONTEXT_POINTERS {

//
// Specify the number of breakpoints and watchpoints that the OS
// will track. Architecturally, LOONGARCH64 supports up to 16. In practice,
// however, almost no one implements more than 4 of each.
// will track.
//

#define RISCV64_MAX_BREAKPOINTS 8
Expand All @@ -541,6 +540,7 @@ typedef struct DECLSPEC_ALIGN(16) _T_CONTEXT {
//

/* +0x000 */ DWORD ContextFlags;
/* +0x004 */ DWORD Fcsr;

//
// Integer registers
Expand Down Expand Up @@ -584,7 +584,6 @@ typedef struct DECLSPEC_ALIGN(16) _T_CONTEXT {
//
//TODO-RISCV64: support the SIMD.
ULONGLONG F[32];
DWORD Fcsr;
} T_CONTEXT, *PT_CONTEXT;

// _IMAGE_RISCV64_RUNTIME_FUNCTION_ENTRY (see ExternalAPIs\Win9CoreSystem\inc\winnt.h)
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/pal/inc/pal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2280,6 +2280,7 @@ typedef struct DECLSPEC_ALIGN(16) _CONTEXT {
//

/* +0x000 */ DWORD ContextFlags;
/* +0x004 */ DWORD Fcsr;

//
// Integer registers.
Expand Down Expand Up @@ -2323,7 +2324,6 @@ typedef struct DECLSPEC_ALIGN(16) _CONTEXT {
//
// TODO-RISCV64: support the SIMD.
ULONGLONG F[32];
DWORD Fcsr;
} CONTEXT, *PCONTEXT, *LPCONTEXT;

//
Expand Down
2 changes: 1 addition & 1 deletion src/coreclr/vm/riscv64/asmconstants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ ASMCONSTANTS_C_ASSERT(SIZEOF__GSCookie == sizeof(GSCookie));
#define SIZEOF__Frame 0x10
ASMCONSTANTS_C_ASSERT(SIZEOF__Frame == sizeof(Frame));

#define SIZEOF__CONTEXT 0x220
#define SIZEOF__CONTEXT 0x210
ASMCONSTANTS_C_ASSERT(SIZEOF__CONTEXT == sizeof(T_CONTEXT));


Expand Down