Skip to content

[WIP] Fix to move to using GC pal within coreclr on Linux #78521

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

Closed
mangod9 wants to merge 5 commits into from
Closed

[WIP] Fix to move to using GC pal within coreclr on Linux #78521

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef751dc
Modify __int64 definition in PAL to match the OS definition (#77056)
janvorli Oct 18, 2022
8183541
Fix the __int64 to be long long on macOS only (#77268)
janvorli Oct 20, 2022
16495db
statically linking GC PAL on linux (#76985)
mangod9 Oct 25, 2022
540ea21
check the right return value for mmap (#77952)
mangod9 Nov 7, 2022
520c8c3
fixing alignment check which affects MacOS
mangod9 Nov 22, 2022
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
Prev Previous commit
Next Next commit
Fix the __int64 to be long long on macOS only (#77268) 
It turned out that my recent change to redefine __int64 on Unix is
actually correct for macOS only. For other 64 bit Unixes, the __int64
should be defined as long.

This change fixes it.
  • Loading branch information
@janvorli @mangod9
janvorli authored and mangod9 committed Nov 10, 2022
commit 8183541a2ad77422aae0f1cf8d88beb832c49b20
4 changes: 2 additions & 2 deletions src/coreclr/inc/check.inl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,14 +220,14 @@ inline CHECK CheckOverflow(const void *address, UINT64 offset)
CHECK_OK;
}

#if defined(HOST_UNIX) && defined(HOST_64BIT)
#ifdef __APPLE__
inline CHECK CheckOverflow(const void *address, SIZE_T offset)
{
CHECK((UINT64) address + offset >= (UINT64) address);

CHECK_OK;
}
#endif // HOST_UNIX && HOST_BIT64
#endif // __APPLE__

inline CHECK CheckUnderflow(UINT value1, UINT value2)
{
Expand Down
12 changes: 6 additions & 6 deletions src/coreclr/inc/clrtypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,14 @@ inline UINT64 AlignUp(UINT64 value, UINT alignment)
return (value+alignment-1)&~(UINT64)(alignment-1);
}

#if defined(HOST_UNIX) && defined(HOST_64BIT)
#ifdef __APPLE__
inline SIZE_T AlignUp(SIZE_T value, UINT alignment)
{
STATIC_CONTRACT_LEAF;
STATIC_CONTRACT_SUPPORTS_DAC;
return (value+alignment-1)&~(SIZE_T)(alignment-1);
}
#endif // HOST_UNIX && HOST_BIT64
#endif // __APPLE__

inline UINT AlignDown(UINT value, UINT alignment)
{
Expand Down Expand Up @@ -390,13 +390,13 @@ inline UINT AlignmentPad(UINT64 value, UINT alignment)
return (UINT) (AlignUp(value, alignment) - value);
}

#if defined(HOST_UNIX) && defined(HOST_64BIT)
#ifdef __APPLE__
inline UINT AlignmentPad(SIZE_T value, UINT alignment)
{
STATIC_CONTRACT_WRAPPER;
return (UINT) (AlignUp(value, alignment) - value);
}
#endif // HOST_UNIX && HOST_BIT64
#endif // __APPLE__

inline UINT AlignmentTrim(UINT value, UINT alignment)
{
Expand All @@ -423,13 +423,13 @@ inline UINT AlignmentTrim(UINT64 value, UINT alignment)
return ((UINT)value)&(alignment-1);
}

#if defined(HOST_UNIX) && defined(HOST_64BIT)
#ifdef __APPLE__
inline UINT AlignmentTrim(SIZE_T value, UINT alignment)
{
STATIC_CONTRACT_LEAF;
STATIC_CONTRACT_SUPPORTS_DAC;
return ((UINT)value)&(alignment-1);
}
#endif // HOST_UNIX && HOST_BIT64
#endif // __APPLE__

#endif // CLRTYPES_H_
4 changes: 2 additions & 2 deletions src/coreclr/jit/compiler.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,12 +233,12 @@ inline unsigned genLog2(unsigned __int64 value)
#endif
}

#if defined(HOST_UNIX) && defined(HOST_64BIT)
#ifdef __APPLE__
inline unsigned genLog2(size_t value)
{
return genLog2((unsigned __int64)value);
}
#endif // HOST_UNIX && HOST_BIT64
#endif // __APPLE__

/*****************************************************************************
*
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/jit/jit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,12 +635,12 @@ inline size_t unsigned_abs(ssize_t x)
return ((size_t)abs((__int64)x));
}

#ifdef HOST_UNIX
#ifdef __APPLE__
inline size_t unsigned_abs(__int64 x)
{
return ((size_t)abs(x));
}
#endif // HOST_UNIX
#endif // __APPLE__
#endif // TARGET_64BIT

/*****************************************************************************/
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 @@ -4417,7 +4417,7 @@ inline __int64 abs(__int64 _X) {
return llabs(_X);
}

#ifdef HOST_64BIT
#ifdef __APPLE__
inline __int64 abs(SSIZE_T _X) {
return llabs((__int64)_X);
}
Expand Down
4 changes: 4 additions & 0 deletions src/coreclr/pal/inc/pal_mstypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,11 @@ extern "C" {
// they must be either signed or unsigned) and we want to be able to use
// __int64 as though it were intrinsic

#if defined(HOST_64BIT) && !defined(__APPLE__)
#define __int64 long
#else // HOST_64BIT && !__APPLE__
#define __int64 long long
#endif // HOST_64BIT && !__APPLE__
#define __int32 int
#define __int16 short int
#define __int8 char // assumes char is signed
Expand Down