Author: tkreuzer
Date: Sat Nov 20 00:36:00 2010
New Revision: 49650
URL:
http://svn.reactos.org/svn/reactos?rev=49650&view=rev
Log:
[SPEC2DEF]
- Fix handling of multiple arches
- Remove unused code
Modified:
branches/cmake-bringup/tools/spec2def/spec2def.c
Modified: branches/cmake-bringup/tools/spec2def/spec2def.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/tools/spec2def/sp…
==============================================================================
--- branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] (original)
+++ branches/cmake-bringup/tools/spec2def/spec2def.c [iso-8859-1] Sat Nov 20 00:36:00
2010
@@ -40,7 +40,7 @@
int
IsSeparator(char chr)
{
- return ((chr <= '*' && chr != '$') ||
+ return ((chr <= ',' && chr != '$') ||
(chr >= ':' && chr < '?') );
}
@@ -174,59 +174,6 @@
{
fprintf(fileDest, "@%d", exp->nStackBytes);
}
- }
-
- if (exp->nOrdinal != -1)
- {
- fprintf(fileDest, " @%d", exp->nOrdinal);
- }
-
- if (exp->nCallingConvention == CC_EXTERN)
- {
- fprintf(fileDest, " DATA");
- }
-
- fprintf(fileDest, "\n");
-
- return 1;
-}
-
-void
-OutputHeader_pdef(FILE *file, char *libname)
-{
- fprintf(file,
- "; File generated automatically, do not edit!\n\n"
- "LIBRARY %s\n\n"
- "EXPORTS\n"
- "#define FOOL(x) x\n"
- "#if defined(__GNUC__) && defined(_X86_)\n"
- "#define _NAME_STDCALL(name, stackbytes) FOOL(name)@stackbytes\n"
- "#define _NAME_FASTCALL(name, stackbytes)
FOOL(@)FOOL(name)@stackbytes\n"
- "#define _NAME_CDECL(name, stackbytes) FOOL(name)\n"
- "#else\n"
- "#define _NAME_STDCALL(name, stackbytes) name\n"
- "#define _NAME_FASTCALL(name, stackbytes) name\n"
- "#define _NAME_CDECL(name, stackbytes) name\n"
- "#endif\n"
- "#define _NAME_EXTERN(name, stackbytes) name\n"
- "#define _NAME(name, cc, stackbytes) _NAME_##cc(name,
stackbytes)\n",
- libname);
-}
-
-int
-OutputLine_pdef(FILE *fileDest, EXPORT *exp)
-{
- fprintf(fileDest, "_NAME(%.*s,%s,%d)",
- exp->nNameLength, exp->pcName,
- astrCallingConventions[exp->nCallingConvention],
- exp->nStackBytes);
-
- if (exp->pcRedirection)
- {
- fprintf(fileDest, "= _NAME(%.*s,%s,%d)",
- exp->nRedirectionLength, exp->pcRedirection,
- astrCallingConventions[exp->nCallingConvention],
- exp->nStackBytes);
}
if (exp->nOrdinal != -1)
@@ -339,7 +286,6 @@
if (CompareToken(pc, pszArchString))
{
included = 1;
- break;
}
/* Skip to next arch or end */