UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge.

Browse Source
This commit is contained in:
Nicholas Hastings 2011-07-06 15:30:19 -04:00
commit f32d3849e5
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pushbuild.txt
View File

@ -49,3 +49,4 @@ IT'S CLOBBERIN' TIME
vc2005 supremecy vc2005 supremecy
clobbermonkey clobbermonkey
that thing that thing
clobber build because amx.h changed (sigh)

2
sourcepawn/compiler/amx.h
View File

@ -228,7 +228,7 @@ typedef struct tagAMX_NATIVE_INFO {
#define AMX_USERNUM 4 #define AMX_USERNUM 4
#define sEXPMAX 19 /* maximum name length for file version <= 6 */ #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 { typedef struct tagAMX_FUNCSTUB {
ucell address; ucell address;

20
sourcepawn/jit/x86/jit_x86.cpp
View File

@ -2544,17 +2544,7 @@ bool JITX86::InitializeJIT()
jit = &writer; 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 */ /* Build the entry point */
writer = JitWriter();
jit->outbase = NULL; jit->outbase = NULL;
jit->outptr = NULL; jit->outptr = NULL;
Write_Execute_Function(jit); Write_Execute_Function(jit);
@ -2564,6 +2554,16 @@ bool JITX86::InitializeJIT()
offs = Write_Execute_Function(jit); offs = Write_Execute_Function(jit);
m_pJitReturn = (uint8_t *)m_pJitEntry + offs; 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; return true;
} }

2
tools/buildbot/package.pl
View File

@ -75,7 +75,7 @@ $ftp_path .= "/$major.$minor";
my ($ftp); 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: $@"; or die "Cannot connect to host $ftp_host: $@";
$ftp->login($ftp_user, $ftp_pass) $ftp->login($ftp_user, $ftp_pass)