Merge.
authorNicholas Hastings <skamonkey@gmail.com>
Wed Jul 06 15:30:19 2011 -0400 (2011-07-06)
changeset 3331744498997d50
parent 3330 643ca8c2db11
parent 3328 5873eac6b9b1
child 3332 e0af1cba759f
Merge.
     1.1 --- a/pushbuild.txt	Wed Jul 06 15:27:41 2011 -0400
     1.2 +++ b/pushbuild.txt	Wed Jul 06 15:30:19 2011 -0400
     1.3 @@ -49,3 +49,4 @@
     1.4  vc2005 supremecy
     1.5  clobbermonkey
     1.6  that thing
     1.7 +clobber build because amx.h changed (sigh)
     2.1 --- a/sourcepawn/compiler/amx.h	Wed Jul 06 15:27:41 2011 -0400
     2.2 +++ b/sourcepawn/compiler/amx.h	Wed Jul 06 15:30:19 2011 -0400
     2.3 @@ -228,7 +228,7 @@
     2.4  
     2.5  #define AMX_USERNUM     4
     2.6  #define sEXPMAX         19      /* maximum name length for file version <= 6 */
     2.7 -#define sNAMEMAX        31      /* maximum name length of symbol name */
     2.8 +#define sNAMEMAX        63      /* maximum name length of symbol name */
     2.9  
    2.10  typedef struct tagAMX_FUNCSTUB {
    2.11    ucell address;
     3.1 --- a/sourcepawn/jit/x86/jit_x86.cpp	Wed Jul 06 15:27:41 2011 -0400
     3.2 +++ b/sourcepawn/jit/x86/jit_x86.cpp	Wed Jul 06 15:30:19 2011 -0400
     3.3 @@ -2544,17 +2544,7 @@
     3.4  
     3.5  	jit = &writer;
     3.6  	
     3.7 -	/* Build the genarray intrinsic */
     3.8 -	jit->outbase = NULL;
     3.9 -	jit->outptr = NULL;
    3.10 -	WriteIntrinsic_GenArray(jit);
    3.11 -	m_pJitGenArray = Knight::KE_AllocCode(g_pCodeCache, jit->get_outputpos());
    3.12 -	jit->outbase = (jitcode_t)m_pJitGenArray;
    3.13 -	jit->outptr = jit->outbase;
    3.14 -	WriteIntrinsic_GenArray(jit);
    3.15 -
    3.16  	/* Build the entry point */
    3.17 -	writer = JitWriter();
    3.18  	jit->outbase = NULL;
    3.19  	jit->outptr = NULL;
    3.20  	Write_Execute_Function(jit);
    3.21 @@ -2564,6 +2554,16 @@
    3.22  	offs = Write_Execute_Function(jit);
    3.23  	m_pJitReturn = (uint8_t *)m_pJitEntry + offs;
    3.24  
    3.25 +	/* Build the genarray intrinsic */
    3.26 +	writer = JitWriter();
    3.27 +	jit->outbase = NULL;
    3.28 +	jit->outptr = NULL;
    3.29 +	WriteIntrinsic_GenArray(jit);
    3.30 +	m_pJitGenArray = Knight::KE_AllocCode(g_pCodeCache, jit->get_outputpos());
    3.31 +	jit->outbase = (jitcode_t)m_pJitGenArray;
    3.32 +	jit->outptr = jit->outbase;
    3.33 +	WriteIntrinsic_GenArray(jit);
    3.34 +
    3.35  	return true;
    3.36  }
    3.37  
     4.1 --- a/tools/buildbot/package.pl	Wed Jul 06 15:27:41 2011 -0400
     4.2 +++ b/tools/buildbot/package.pl	Wed Jul 06 15:30:19 2011 -0400
     4.3 @@ -75,7 +75,7 @@
     4.4  
     4.5  my ($ftp);
     4.6  
     4.7 -$ftp = Net::FTP->new($ftp_host, Debug => 0) 
     4.8 +$ftp = Net::FTP->new($ftp_host, Debug => 0, Passive => 0) 
     4.9      or die "Cannot connect to host $ftp_host: $@";
    4.10  
    4.11  $ftp->login($ftp_user, $ftp_pass)