From 68976ecb5f15841a012c21a2c06feffac46a2e0a Mon Sep 17 00:00:00 2001 From: marvim Date: Thu, 16 Nov 2023 05:15:58 +0000 Subject: [PATCH] deps src: Automatic update --- src/luajit-stamp/download-luajit.cmake | 34 +++++++++++++------------- src/luajit-stamp/extract-luajit.cmake | 2 +- src/luajit-stamp/luajit-urlinfo.txt | 4 +-- src/luajit/.relver | 2 +- src/luajit/src/lj_asm_x86.h | 17 +++++++------ 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/src/luajit-stamp/download-luajit.cmake b/src/luajit-stamp/download-luajit.cmake index e2b76c9e7..07cc157d7 100644 --- a/src/luajit-stamp/download-luajit.cmake +++ b/src/luajit-stamp/download-luajit.cmake @@ -22,16 +22,16 @@ function(check_file_hash has_hash hash_is_good) set("${has_hash}" TRUE PARENT_SCOPE) message(STATUS "verifying file... - file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz'") + file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz'") - file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz" actual_value) + file("SHA256" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz" actual_value) - if(NOT "${actual_value}" STREQUAL "a1a6512a2ab3ce5a41c69f3841b6fd9fddb046bff2c39ebb9a34ed0083ab0853") + if(NOT "${actual_value}" STREQUAL "4fefa19bc5600928fb13c928bf5325eaa1c78f2c1738a8ac9552154ef178bb9a") set("${hash_is_good}" FALSE PARENT_SCOPE) message(STATUS "SHA256 hash of - /home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz + /home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz does not match expected value - expected: 'a1a6512a2ab3ce5a41c69f3841b6fd9fddb046bff2c39ebb9a34ed0083ab0853' + expected: '4fefa19bc5600928fb13c928bf5325eaa1c78f2c1738a8ac9552154ef178bb9a' actual: '${actual_value}'") else() set("${hash_is_good}" TRUE PARENT_SCOPE) @@ -71,40 +71,40 @@ function(sleep_before_download attempt) execute_process(COMMAND "${CMAKE_COMMAND}" -E sleep "${sleep_seconds}") endfunction() -if("/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz" STREQUAL "") +if("/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz" STREQUAL "") message(FATAL_ERROR "LOCAL can't be empty") endif() -if("https://github.com/LuaJIT/LuaJIT/archive/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz" STREQUAL "") +if("https://github.com/LuaJIT/LuaJIT/archive/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz" STREQUAL "") message(FATAL_ERROR "REMOTE can't be empty") endif() -if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz") +if(EXISTS "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz") check_file_hash(has_hash hash_is_good) if(has_hash) if(hash_is_good) message(STATUS "File already exists and hash match (skip download): - file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz' - SHA256='a1a6512a2ab3ce5a41c69f3841b6fd9fddb046bff2c39ebb9a34ed0083ab0853'" + file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz' + SHA256='4fefa19bc5600928fb13c928bf5325eaa1c78f2c1738a8ac9552154ef178bb9a'" ) return() else() message(STATUS "File already exists but hash mismatch. Removing...") - file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz") + file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz") endif() else() message(STATUS "File already exists but no hash specified (use URL_HASH): - file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz' + file='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz' Old file will be removed and new file downloaded from URL." ) - file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz") + file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz") endif() endif() set(retry_number 5) message(STATUS "Downloading... - dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz' + dst='/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz' timeout='none' inactivity timeout='none'" ) @@ -115,7 +115,7 @@ foreach(i RANGE ${retry_number}) if(status_code IN_LIST download_retry_codes) sleep_before_download(${i}) endif() - foreach(url https://github.com/LuaJIT/LuaJIT/archive/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz) + foreach(url https://github.com/LuaJIT/LuaJIT/archive/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz) if(NOT url IN_LIST skip_url_list) message(STATUS "Using src='${url}'") @@ -126,7 +126,7 @@ foreach(i RANGE ${retry_number}) file( DOWNLOAD - "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz" + "${url}" "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz" # no TIMEOUT # no INACTIVITY_TIMEOUT @@ -143,7 +143,7 @@ foreach(i RANGE ${retry_number}) check_file_hash(has_hash hash_is_good) if(has_hash AND NOT hash_is_good) message(STATUS "Hash mismatch, removing...") - file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz") + file(REMOVE "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz") else() message(STATUS "Downloading... done") return() diff --git a/src/luajit-stamp/extract-luajit.cmake b/src/luajit-stamp/extract-luajit.cmake index 903ff2386..99d67a441 100644 --- a/src/luajit-stamp/extract-luajit.cmake +++ b/src/luajit-stamp/extract-luajit.cmake @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.5) # Make file names absolute: # -get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz" ABSOLUTE) +get_filename_component(filename "/home/runner/work/deps/deps/neovim/deps/build/downloads/luajit/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz" ABSOLUTE) get_filename_component(directory "/home/runner/work/deps/deps/neovim/deps/build/src/luajit" ABSOLUTE) message(STATUS "extracting... diff --git a/src/luajit-stamp/luajit-urlinfo.txt b/src/luajit-stamp/luajit-urlinfo.txt index f642733ce..dc8dd080e 100644 --- a/src/luajit-stamp/luajit-urlinfo.txt +++ b/src/luajit-stamp/luajit-urlinfo.txt @@ -6,7 +6,7 @@ method=url command=/usr/local/bin/cmake;-P;/home/runner/work/deps/deps/neovim/deps/build/src/luajit-stamp/download-luajit.cmake;COMMAND;/usr/local/bin/cmake;-P;/home/runner/work/deps/deps/neovim/deps/build/src/luajit-stamp/verify-luajit.cmake;COMMAND;/usr/local/bin/cmake;-P;/home/runner/work/deps/deps/neovim/deps/build/src/luajit-stamp/extract-luajit.cmake source_dir=/home/runner/work/deps/deps/neovim/deps/build/src/luajit work_dir=/home/runner/work/deps/deps/neovim/deps/build/src -url(s)=https://github.com/LuaJIT/LuaJIT/archive/113a168b792cd367822ec04cdc2ef32facd28efa.tar.gz -hash=SHA256=a1a6512a2ab3ce5a41c69f3841b6fd9fddb046bff2c39ebb9a34ed0083ab0853 +url(s)=https://github.com/LuaJIT/LuaJIT/archive/43d0a19158ceabaa51b0462c1ebc97612b420a2e.tar.gz +hash=SHA256=4fefa19bc5600928fb13c928bf5325eaa1c78f2c1738a8ac9552154ef178bb9a no_extract= diff --git a/src/luajit/.relver b/src/luajit/.relver index e76df9a8d..a09d4bf1b 100644 --- a/src/luajit/.relver +++ b/src/luajit/.relver @@ -1 +1 @@ -1699801871 +1700008891 diff --git a/src/luajit/src/lj_asm_x86.h b/src/luajit/src/lj_asm_x86.h index 955a54a42..aee337166 100644 --- a/src/luajit/src/lj_asm_x86.h +++ b/src/luajit/src/lj_asm_x86.h @@ -109,7 +109,7 @@ static int asm_isk32(ASMState *as, IRRef ref, int32_t *k) /* Check if there's no conflicting instruction between curins and ref. ** Also avoid fusing loads if there are multiple references. */ -static int noconflict(ASMState *as, IRRef ref, IROp conflict, int noload) +static int noconflict(ASMState *as, IRRef ref, IROp conflict, int check) { IRIns *ir = as->ir; IRRef i = as->curins; @@ -118,7 +118,9 @@ static int noconflict(ASMState *as, IRRef ref, IROp conflict, int noload) while (--i > ref) { if (ir[i].o == conflict) return 0; /* Conflict found. */ - else if (!noload && (ir[i].op1 == ref || ir[i].op2 == ref)) + else if ((check & 1) && (ir[i].o == IR_NEWREF || ir[i].o == IR_CALLS)) + return 0; + else if ((check & 2) && (ir[i].op1 == ref || ir[i].op2 == ref)) return 0; } return 1; /* Ok, no conflict. */ @@ -134,7 +136,7 @@ static IRRef asm_fuseabase(ASMState *as, IRRef ref) lj_assertA(irb->op2 == IRFL_TAB_ARRAY, "expected FLOAD TAB_ARRAY"); /* We can avoid the FLOAD of t->array for colocated arrays. */ if (ira->o == IR_TNEW && ira->op1 <= LJ_MAX_COLOSIZE && - !neverfuse(as) && noconflict(as, irb->op1, IR_NEWREF, 1)) { + !neverfuse(as) && noconflict(as, irb->op1, IR_NEWREF, 0)) { as->mrm.ofs = (int32_t)sizeof(GCtab); /* Ofs to colocated array. */ return irb->op1; /* Table obj. */ } @@ -456,7 +458,7 @@ static Reg asm_fuseload(ASMState *as, IRRef ref, RegSet allow) RegSet xallow = (allow & RSET_GPR) ? allow : RSET_GPR; if (ir->o == IR_SLOAD) { if (!(ir->op2 & (IRSLOAD_PARENT|IRSLOAD_CONVERT)) && - noconflict(as, ref, IR_RETF, 0) && + noconflict(as, ref, IR_RETF, 2) && !(LJ_GC64 && irt_isaddr(ir->t))) { as->mrm.base = (uint8_t)ra_alloc1(as, REF_BASE, xallow); as->mrm.ofs = 8*((int32_t)ir->op1-1-LJ_FR2) + @@ -467,13 +469,12 @@ static Reg asm_fuseload(ASMState *as, IRRef ref, RegSet allow) } else if (ir->o == IR_FLOAD) { /* Generic fusion is only ok for 32 bit operand (but see asm_comp). */ if ((irt_isint(ir->t) || irt_isu32(ir->t) || irt_isaddr(ir->t)) && - noconflict(as, ref, IR_FSTORE, 0)) { + noconflict(as, ref, IR_FSTORE, 2)) { asm_fusefref(as, ir, xallow); return RID_MRM; } } else if (ir->o == IR_ALOAD || ir->o == IR_HLOAD || ir->o == IR_ULOAD) { - if (noconflict(as, ref, ir->o + IRDELTA_L2S, 0) && - noconflict(as, ref, IR_CALLS, 1) && /* Don't cross table.clear. */ + if (noconflict(as, ref, ir->o + IRDELTA_L2S, 2+(ir->o != IR_ULOAD)) && !(LJ_GC64 && irt_isaddr(ir->t))) { asm_fuseahuref(as, ir->op1, xallow); return RID_MRM; @@ -483,7 +484,7 @@ static Reg asm_fuseload(ASMState *as, IRRef ref, RegSet allow) ** Fusing unaligned memory operands is ok on x86 (except for SIMD types). */ if ((!irt_typerange(ir->t, IRT_I8, IRT_U16)) && - noconflict(as, ref, IR_XSTORE, 0)) { + noconflict(as, ref, IR_XSTORE, 2)) { asm_fusexref(as, ir->op1, xallow); return RID_MRM; }