From a752d220cc1a0682c4c154053a2b308f2def15f1 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 29 Jun 2011 16:05:18 -0700 Subject: [PATCH 1/4] Use active, not passive FTP. --- tools/buildbot/package.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/buildbot/package.pl b/tools/buildbot/package.pl index 28b36420..3f60d8be 100755 --- a/tools/buildbot/package.pl +++ b/tools/buildbot/package.pl @@ -75,7 +75,7 @@ $ftp_path .= "/$major.$minor"; my ($ftp); -$ftp = Net::FTP->new($ftp_host, Debug => 0) +$ftp = Net::FTP->new($ftp_host, Debug => 0, Passive => 0) or die "Cannot connect to host $ftp_host: $@"; $ftp->login($ftp_user, $ftp_pass) From 6c6808235993d6075b0196f75bb5d7a52ff2e372 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 4 Jul 2011 01:57:19 -0700 Subject: [PATCH 2/4] Fix crash when dynamic arrays run out of memory (bug 4632, r=fyren). --- sourcepawn/jit/x86/jit_x86.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sourcepawn/jit/x86/jit_x86.cpp b/sourcepawn/jit/x86/jit_x86.cpp index 01cc2018..69f2a854 100644 --- a/sourcepawn/jit/x86/jit_x86.cpp +++ b/sourcepawn/jit/x86/jit_x86.cpp @@ -2544,17 +2544,7 @@ bool JITX86::InitializeJIT() jit = &writer; - /* Build the genarray intrinsic */ - jit->outbase = NULL; - jit->outptr = NULL; - WriteIntrinsic_GenArray(jit); - m_pJitGenArray = Knight::KE_AllocCode(g_pCodeCache, jit->get_outputpos()); - jit->outbase = (jitcode_t)m_pJitGenArray; - jit->outptr = jit->outbase; - WriteIntrinsic_GenArray(jit); - /* Build the entry point */ - writer = JitWriter(); jit->outbase = NULL; jit->outptr = NULL; Write_Execute_Function(jit); @@ -2564,6 +2554,16 @@ bool JITX86::InitializeJIT() offs = Write_Execute_Function(jit); m_pJitReturn = (uint8_t *)m_pJitEntry + offs; + /* Build the genarray intrinsic */ + writer = JitWriter(); + jit->outbase = NULL; + jit->outptr = NULL; + WriteIntrinsic_GenArray(jit); + m_pJitGenArray = Knight::KE_AllocCode(g_pCodeCache, jit->get_outputpos()); + jit->outbase = (jitcode_t)m_pJitGenArray; + jit->outptr = jit->outbase; + WriteIntrinsic_GenArray(jit); + return true; } From 1ff0f478d476a1f65c0b9e1b5eef442a51a9fb19 Mon Sep 17 00:00:00 2001 From: javalia Date: Mon, 4 Jul 2011 15:26:08 -0700 Subject: [PATCH 3/4] Increase symbol name limit to 63 characters (bug 4564, r=dvander). --- sourcepawn/compiler/amx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sourcepawn/compiler/amx.h b/sourcepawn/compiler/amx.h index 577afff8..b8de039a 100644 --- a/sourcepawn/compiler/amx.h +++ b/sourcepawn/compiler/amx.h @@ -228,7 +228,7 @@ typedef struct tagAMX_NATIVE_INFO { #define AMX_USERNUM 4 #define sEXPMAX 19 /* maximum name length for file version <= 6 */ -#define sNAMEMAX 31 /* maximum name length of symbol name */ +#define sNAMEMAX 63 /* maximum name length of symbol name */ typedef struct tagAMX_FUNCSTUB { ucell address; From 75121588c4d6ddc7cadf77d6d593d95ace6e1fd4 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 4 Jul 2011 15:33:11 -0700 Subject: [PATCH 4/4] Clobber --- pushbuild.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/pushbuild.txt b/pushbuild.txt index d6262800..e941ddca 100644 --- a/pushbuild.txt +++ b/pushbuild.txt @@ -49,3 +49,4 @@ IT'S CLOBBERIN' TIME vc2005 supremecy clobbermonkey that thing +clobber build because amx.h changed (sigh)