1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix i386-ucrt build

Browse Source
This commit is contained in:
Raed Rizqie 2024-08-10 12:58:56 +08:00 committed by Nobuyoshi Nakada
parent b1f4222fc5
commit f1224e55fd
Notes: git 2024-08-10 15:10:47 +00:00 
Merged: https://github.com/ruby/ruby/pull/11358
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
win32/win32.c
View File

@ -2582,7 +2582,7 @@ set_pioinfo_extra(void)
char *p = (char*)get_proc_address(UCRTBASE, "_isatty", NULL); char *p = (char*)get_proc_address(UCRTBASE, "_isatty", NULL);
/* _osfile(fh) & FDEV */ /* _osfile(fh) & FDEV */
#ifdef _M_ARM64 #if defined(_M_ARM64) || defined(__aarch64__)
#define IS_INSN(pc, name) ((*(pc) & name##_mask) == name##_id) #define IS_INSN(pc, name) ((*(pc) & name##_mask) == name##_id)
const int max_num_inst = 500; const int max_num_inst = 500;
uint32_t *start = (uint32_t*)p; uint32_t *start = (uint32_t*)p;
@ -2664,15 +2664,21 @@ set_pioinfo_extra(void)
# else /* x86 */ # else /* x86 */
/* pop ebp */ /* pop ebp */
# define FUNCTION_BEFORE_RET_MARK "\x5d" # define FUNCTION_BEFORE_RET_MARK "\x5d"
/* leave */
# define FUNCTION_BEFORE_RET_MARK_2 "\xc9"
# define FUNCTION_SKIP_BYTES 0 # define FUNCTION_SKIP_BYTES 0
/* mov eax,dword ptr [eax*4+100EB430h] */ /* mov eax,dword ptr [eax*4+100EB430h] */
# define PIOINFO_MARK "\x8B\x04\x85" # define PIOINFO_MARK "\x8B\x04\x85"
# endif # endif
if (p) { if (p) {
for (pend += 10; pend < p + 300; pend++) { for (pend += 10; pend < p + 500; pend++) {
// find end of function // find end of function
if (memcmp(pend, FUNCTION_BEFORE_RET_MARK, sizeof(FUNCTION_BEFORE_RET_MARK) - 1) == 0 && if ((memcmp(pend, FUNCTION_BEFORE_RET_MARK, sizeof(FUNCTION_BEFORE_RET_MARK) - 1) == 0
(*(pend + (sizeof(FUNCTION_BEFORE_RET_MARK) - 1) + FUNCTION_SKIP_BYTES) & FUNCTION_RET) == FUNCTION_RET) { # ifdef FUNCTION_BEFORE_RET_MARK_2
|| memcmp(pend, FUNCTION_BEFORE_RET_MARK_2, sizeof(FUNCTION_BEFORE_RET_MARK_2) - 1) == 0
# endif
) &&
*(pend + (sizeof(FUNCTION_BEFORE_RET_MARK) - 1) + FUNCTION_SKIP_BYTES) == (char)FUNCTION_RET) {
// search backwards from end of function // search backwards from end of function
for (pend -= (sizeof(PIOINFO_MARK) - 1); pend > p; pend--) { for (pend -= (sizeof(PIOINFO_MARK) - 1); pend > p; pend--) {
if (memcmp(pend, PIOINFO_MARK, sizeof(PIOINFO_MARK) - 1) == 0) { if (memcmp(pend, PIOINFO_MARK, sizeof(PIOINFO_MARK) - 1) == 0) {