Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added assembler implementation

Browse Source
This commit is contained in:
David Anderson 2004-09-06 09:09:36 +00:00
parent b040f4474b
commit 3297cf2e9b
3 changed files with 2139 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
amxmodx/Makefile.pl
View File

@ -12,6 +12,8 @@
# amd64 - compile for AMD64 (impiles no jit) # amd64 - compile for AMD64 (impiles no jit)
# proc=ix86 - assumed not amd64 # proc=ix86 - assumed not amd64
# clean - clean the specifications above # clean - clean the specifications above
# asm - for ASM implementation
# !! TODO - add memory mananger support
$PROJECT = "amxmodx_mm"; $PROJECT = "amxmodx_mm";
$sdk = "../hlsdk/SourceCode"; $sdk = "../hlsdk/SourceCode";
@ -19,7 +21,7 @@ $mm = "../metamod/metamod";
$gccf = "gcc"; $gccf = "gcc";
$ccf = "cc"; $ccf = "cc";
@CPP_SOURCE_FILES = ("meta_api.cpp", "CFile.cpp", "CVault.cpp", "vault.cpp", "float.cpp", "file.cpp", "modules.cpp", "CMisc.cpp", "CTask.cpp", "string.cpp", "amxmodx.cpp", "CEvent.cpp", "CCmd.cpp", "CLogEvent.cpp", "srvcmd.cpp", "strptime.cpp", "amxcore.cpp", "amxtime.cpp", "power.cpp", "amxxlog.cpp", "fakemeta.cpp", "MMGR/MMGR.cpp", "amxxfile.cpp", "CLang.cpp", "md5.cpp", "emsg.cpp", "CForward.cpp", "CPlugin.cpp", "CModule.cpp", "CMenu.cpp", "util.cpp"); @CPP_SOURCE_FILES = ("meta_api.cpp", "CFile.cpp", "CVault.cpp", "vault.cpp", "float.cpp", "file.cpp", "modules.cpp", "CMisc.cpp", "CTask.cpp", "string.cpp", "amxmodx.cpp", "CEvent.cpp", "CCmd.cpp", "CLogEvent.cpp", "srvcmd.cpp", "strptime.cpp", "amxcore.cpp", "amxtime.cpp", "power.cpp", "amxxlog.cpp", "fakemeta.cpp", "amxxfile.cpp", "CLang.cpp", "md5.cpp", "emsg.cpp", "CForward.cpp", "CPlugin.cpp", "CModule.cpp", "CMenu.cpp", "util.cpp");
@C_SOURCE_FILES = (); @C_SOURCE_FILES = ();
my %OPTIONS, %OPT; my %OPTIONS, %OPT;
@ -31,6 +33,15 @@ $OPTIONS{"include"} = "-I$sdk -I. -I$mm -I$sdk/engine -I$sdk/common -I$sdk/pm_sh
while ($cmd = shift) while ($cmd = shift)
{ {
if ($cmd =~ /asm/)
{
if ($OPTIONS{"amd64"})
{
die "You cannot compile the ASM core with AMD64 yet.\n";
} else {
$OPTIONS{"asm"} = 1;
}
}
if ($cmd =~ /jit/) if ($cmd =~ /jit/)
{ {
if ($OPTIONS{"amd64"}) if ($OPTIONS{"amd64"})
@ -40,9 +51,9 @@ while ($cmd = shift)
$OPTIONS{"jit"} = 1; $OPTIONS{"jit"} = 1;
} }
} elsif ($cmd =~ /amd64/) { } elsif ($cmd =~ /amd64/) {
if ($OPTIONS{"jit"}) if ($OPTIONS{"jit"} || $OPTIONS{"asm"})
{ {
die "You cannot compile the JIT and AMD64 yet.\n"; die "You cannot compile the JIT or ASM and AMD64 yet.\n";
} else { } else {
$OPTIONS{"amd64"} = 1; $OPTIONS{"amd64"} = 1;
} }
@ -64,8 +75,14 @@ while ($cmd = shift)
$gcc = `$gccf --version`; $gcc = `$gccf --version`;
if ($gcc =~ /2\.9/) if ($gcc =~ /2\.9/)
{ {
push(@CPP_SOURCE_FILES, "amx.cpp"); if ($OPTIONS{"jit"})
$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2"; {
push(@CPP_SOURCE_FILES, "amx.cpp");
$OPT{"opt"} .= " -malign-loops=2 -malign-jumps=2 -malign-functions=2";
} else {
`ln -s amx.cpp amx.c`;
push(@C_SOURCE_FILES, "amx.c");
}
} else { } else {
if ($OPTIONS{"amd64"}) if ($OPTIONS{"amd64"})
{ {
@ -104,6 +121,11 @@ if ($OPTIONS{"jit"})
$cflags .= " -DJIT"; $cflags .= " -DJIT";
} }
if ($OPTIONS{"asm"})
{
$cflags .= " -DASM32";
}
if ($OPTIONS{"debug"}) if ($OPTIONS{"debug"})
{ {
$outdir = "bin.debug"; $outdir = "bin.debug";
@ -156,6 +178,11 @@ if ($OPTIONS{"jit"})
push(@LINK, "JIT/jits.o"); push(@LINK, "JIT/jits.o");
} }
if ($OPTIONS{"asm"})
{
push(@LINK, "amxexecn.o");
}
if (!(-d $outdir)) if (!(-d $outdir))
{ {
mkdir($outdir); mkdir($outdir);
@ -219,6 +246,6 @@ for ($i=0; $i<=$#CPP_SOURCE_FILES; $i++)
} }
} }
$gcc = "$gccf $cflags -Lzlib/ -shared -ldl -lstdc++ @LINK -lm -lz -o $outdir/$bin"; $gcc = "$gccf $cflags -Lzlib/ -shared -ldl -lm -lz @LINK -o $outdir/$bin";
print "$gcc\n"; print "$gcc\n";
`$gcc`; `$gcc`;

8
amxmodx/amx.cpp
View File

@ -2728,16 +2728,16 @@ static void *amx_opcodelist_nodebug[] = {
#endif #endif
#elif defined __GNUC__ #elif defined __GNUC__
/* force "cdecl" by adding an "attribute" to the declaration */ /* force "cdecl" by adding an "attribute" to the declaration */
extern "C" cell amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea) __attribute__((cdecl)); extern cell amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea) __attribute__((cdecl));
#else #else
/* force "cdecl" by specifying it as a "function class" with the "__cdecl" keyword */ /* force "cdecl" by specifying it as a "function class" with the "__cdecl" keyword */
extern "C" cell __cdecl amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea); extern cell __cdecl amx_exec_asm(cell *regs,cell *retval,cell stp,cell hea);
#endif #endif
#endif #endif
#if defined ASM32 || defined JIT #if defined ASM32 || defined JIT
extern "C" void *amx_opcodelist[]; extern void *amx_opcodelist[];
extern "C" void *amx_opcodelist_nodebug[]; extern void *amx_opcodelist_nodebug[];
#endif #endif
int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...) int AMXAPI amx_Exec(AMX *amx, cell *retval, int index, int numparams, ...)

2102
amxmodx/amxexecn.asm Executable file
View File

File diff suppressed because it is too large Load Diff