Skip to content

Commit

Permalink
Automate handling of support code for OS/2 binaries.
Browse files Browse the repository at this point in the history 
Now a perl script parses our headers and generates glue code, export tables,
etc. This automates all the macro nonsense and bridge code, and separates
out all the stuff you need for binary compat with OS/2, so you can remove it
all from the build if you want to just build native libraries that supply
the OS/2 API to native apps (like Winelib vs Wine).

This makes upkeep details less nasty, and easier to build native binaries
when implementing and improving APIs, so you can debug directly without
a lot of drama.
  • Loading branch information
@icculus
icculus committed Feb 27, 2018
1 parent dcf40e8 commit 6821de5
Show file tree
Hide file tree
Showing 33 changed files with 989 additions and 587 deletions.
235 changes: 235 additions & 0 deletions lxapigen.pl
View file
@@ -0,0 +1,235 @@
#!/usr/bin/perl -w

use warnings;
use strict;

my %typesizes = (
'LONG' => 4,
'ULONG' => 4,
'SHORT' => 2,
'USHORT' => 2,
'HVIO' => 2,
'HKBD' => 2,
);

sub typesize {
my $t = shift;
return 4 if ($t =~ /\AP/); # pointers are 4 bytes (16:16).
die("Unknown type '$t', please update \%typesizes\n") if not defined $typesizes{$t};
return $typesizes{$t};
}

my $dirname = defined $ARGV[0] ? $ARGV[0] : 'native';
opendir(DIRH, $dirname) or die("Failed to opendir '$dirname': $!\n");

while (readdir(DIRH)) {
next if not /\.h\Z/;
next if /\Aos2/;
next if /\-lx\.h\Z/;

my $module = $_;
my $header = "$dirname/$module";
$module =~ s/\.h\Z//;
open(IN, '<', $header) or die("Failed to open '$header' for reading: $!\n");

print("$module ...\n");

my %ordinalmap = ();
my $has16bitfns = 0;

while (<IN>) {
chomp;
next if not /OS2APIINFO/;
my $line = $_;

if (/\AOS2EXPORT\s+(.*?)\s+(OS2API|OS2API16)\s+(.*?)\((.*?)\)\s+OS2APIINFO\((.*?)\);/) {
my %table = (
'rettype' => $1,
'apitype' => $2,
'fn' => $3,
'args' => $4,
);
my $apiinfo = $5;

my $is16bit = $table{'apitype'} eq 'OS2API16';
$table{'is16bit'} = $is16bit;
$has16bitfns |= $is16bit;

#print("rettype='$rettype' fn='$fn' args='$args' apiinfo='$apiinfo'\n");

my $fn = $table{'fn'};
my $ordinal;
if ($apiinfo =~ /\A(\d+)\Z/) {
$ordinal = int($1);
} else {
die("bogus OS2APIINFO for '$fn'\n");
}

$table{'ordinal'} = $ordinal;

if (defined $ordinalmap{$ordinal}) {
my $dupfn = $ordinalmap{$ordinal}{'fn'};
die("Duplicate ordinal #$ordinal between '$fn' and '$dupfn'\n");
}

$ordinalmap{$ordinal} = \%table;
} else {
die ("Couldn't parse:\n\n $line\n\n")
}
}

close(IN);

next if (not %ordinalmap); # no exported items?

#use Data::Dumper qw(Dumper); print Dumper \%ordinalmap;


# Here we go...

my $outfname = "$dirname/$module-lx.h";
open(OUT, '>', $outfname) or die("Failed to open '$outfname' for writing: $!\n");

print OUT <<EOF
/**
* 2ine; an OS/2 emulator for Linux.
*
* Please see the file LICENSE.txt in the source's root directory.
*/
/* THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. see lxapigen.pl */
/* This is glue code for OS/2 binaries. Native binaries don't need this. */
#if LX_LEGACY
EOF
;

foreach (sort { $a <=> $b } keys(%ordinalmap) ) {
my $tableref = $ordinalmap{$_};
my $fn = $tableref->{'fn'};
my $argstr = $tableref->{'args'};
my $rettype = $tableref->{'rettype'};
my $is16bit = $tableref->{'is16bit'};
my @args = ();

if (($argstr ne 'VOID') and ($argstr ne 'void')) {
@args = split /,/, $argstr;
}

# Build a little wrapper that'll pull arguments off the stack and
# convert to whatever the native calling conventions are.
if ($is16bit) {
print OUT "static $rettype bridge16to32_$fn(uint8 *args) {\n";
#foreach (@args) {
# arguments are listed backwards here.
for my $i (reverse 0..$#args) {
my $arg = $args[$i];
my ($t, $n) = $arg =~ /\A\s*(.*?)\s+(.*?)\s*\Z/;
#print("arg='$_' t='$t' n='$n'\n");
my $a = ($t =~ /\AP/) ? 'PTRARG' : 'ARG'; # it's a pointer?
print OUT " LX_NATIVE_MODULE_16BIT_BRIDGE_$a($t, $n);\n";
}

print OUT " ";
if (($rettype ne 'void') && ($rettype ne 'VOID')) {
# Currently it's reasonable to assume the retval will land in EAX.
print OUT "return ";
}

print OUT "$fn(";
my $comma = '';
foreach (@args) {
my ($t, $n) = /\A\s*(.*?)\s+(.*?)\s*\Z/;
print OUT "$comma$n";
$comma = ', ';
}
print OUT ");\n";

print OUT "}\n\n";
}
}

if ($has16bitfns) {
print OUT "LX_NATIVE_MODULE_16BIT_SUPPORT()\n";
foreach (sort { $a <=> $b } keys(%ordinalmap) ) {
my $tableref = $ordinalmap{$_};
next if not $tableref->{'is16bit'};
my $fn = $tableref->{'fn'};
print OUT " LX_NATIVE_MODULE_16BIT_API($fn)\n";
}

print OUT "LX_NATIVE_MODULE_16BIT_SUPPORT_END()\n";
print OUT "\n";
print OUT "LX_NATIVE_MODULE_DEINIT({\n";
print OUT " LX_NATIVE_MODULE_DEINIT_16BIT_SUPPORT();\n";
print OUT "})\n";
print OUT "\n";
print OUT "static int init16_$module(void) {\n";
print OUT " LX_NATIVE_MODULE_INIT_16BIT_SUPPORT()\n";

foreach (sort { $a <=> $b } keys(%ordinalmap) ) {
my $tableref = $ordinalmap{$_};
next if not $tableref->{'is16bit'};
my $fn = $tableref->{'fn'};
my $argstr = $tableref->{'args'};
my $argbytes = 0;
my @args = ();

if (($argstr ne 'VOID') and ($argstr ne 'void')) {
@args = split /,/, $argstr;
}

foreach (@args) {
my ($t, $n) = /\A\s*(.*?)\s+(.*?)\s*\Z/;
$argbytes += typesize($t);
}
print OUT " LX_NATIVE_INIT_16BIT_BRIDGE($fn, $argbytes)\n";
}

print OUT " LX_NATIVE_MODULE_INIT_16BIT_SUPPORT_END()\n";
print OUT " return 1;\n";
print OUT "}\n\n";
}

print OUT "LX_NATIVE_MODULE_INIT(";
if ($has16bitfns) {
print OUT "{ if (!init16_$module()) return 0; }";
}
print OUT ")\n";

my $comma = '';
foreach (sort { $a <=> $b } keys(%ordinalmap) ) {
my $tableref = $ordinalmap{$_};
my $fn = $tableref->{'fn'};
my $ordinal = $tableref->{'ordinal'};
my $suffix = $tableref->{'is16bit'} ? '16' : '';

print OUT $comma;
# This is a hack for tcpip32, which doesn't want to step on BSD sockets symbols.
if ($fn =~ /\AOS2_(.*)\Z/) {
print OUT " LX_NATIVE_EXPORT_DIFFERENT_NAME($fn, \"$1\", $ordinal)";
} else {
print OUT " LX_NATIVE_EXPORT$suffix($fn, $ordinal)";
}
$comma = ",\n";
}
print OUT "\n";

print OUT <<EOF
LX_NATIVE_MODULE_INIT_END()
#endif /* LX_LEGACY */
/* end of $module-lx.h ... */
EOF
;

close(OUT);
}

closedir(DIRH);

# end of lxapigen.pl ...

136 changes: 136 additions & 0 deletions native/doscalls-lx.h
View file
@@ -0,0 +1,136 @@
/**
* 2ine; an OS/2 emulator for Linux.
*
* Please see the file LICENSE.txt in the source's root directory.
*/

/* THIS FILE IS AUTOGENERATED. DO NOT EDIT BY HAND. see lxapigen.pl */

/* This is glue code for OS/2 binaries. Native binaries don't need this. */
#if LX_LEGACY

static APIRET16 bridge16to32_DosSemRequest(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_ARG(LONG, ms);
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PHSEM16, sem);
return DosSemRequest(sem, ms);
}

static APIRET16 bridge16to32_DosSemClear(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PHSEM16, sem);
return DosSemClear(sem);
}

static APIRET16 bridge16to32_DosSemWait(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_ARG(LONG, ms);
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PHSEM16, sem);
return DosSemWait(sem, ms);
}

static APIRET16 bridge16to32_DosSemSet(uint8 *args) {
LX_NATIVE_MODULE_16BIT_BRIDGE_PTRARG(PHSEM16, sem);
return DosSemSet(sem);
}

LX_NATIVE_MODULE_16BIT_SUPPORT()
LX_NATIVE_MODULE_16BIT_API(DosSemRequest)
LX_NATIVE_MODULE_16BIT_API(DosSemClear)
LX_NATIVE_MODULE_16BIT_API(DosSemWait)
LX_NATIVE_MODULE_16BIT_API(DosSemSet)
LX_NATIVE_MODULE_16BIT_SUPPORT_END()

LX_NATIVE_MODULE_DEINIT({
LX_NATIVE_MODULE_DEINIT_16BIT_SUPPORT();
})

static int init16_doscalls(void) {
LX_NATIVE_MODULE_INIT_16BIT_SUPPORT()
LX_NATIVE_INIT_16BIT_BRIDGE(DosSemRequest, 8)
LX_NATIVE_INIT_16BIT_BRIDGE(DosSemClear, 4)
LX_NATIVE_INIT_16BIT_BRIDGE(DosSemWait, 8)
LX_NATIVE_INIT_16BIT_BRIDGE(DosSemSet, 4)
LX_NATIVE_MODULE_INIT_16BIT_SUPPORT_END()
return 1;
}

LX_NATIVE_MODULE_INIT({ if (!init16_doscalls()) return 0; })
LX_NATIVE_EXPORT16(DosSemRequest, 140),
LX_NATIVE_EXPORT16(DosSemClear, 141),
LX_NATIVE_EXPORT16(DosSemWait, 142),
LX_NATIVE_EXPORT16(DosSemSet, 143),
LX_NATIVE_EXPORT(DosSetMaxFH, 209),
LX_NATIVE_EXPORT(DosSetPathInfo, 219),
LX_NATIVE_EXPORT(DosQueryPathInfo, 223),
LX_NATIVE_EXPORT(DosQueryHType, 224),
LX_NATIVE_EXPORT(DosScanEnv, 227),
LX_NATIVE_EXPORT(DosSleep, 229),
LX_NATIVE_EXPORT(DosGetDateTime, 230),
LX_NATIVE_EXPORT(DosDevConfig, 231),
LX_NATIVE_EXPORT(DosExit, 234),
LX_NATIVE_EXPORT(DosResetBuffer, 254),
LX_NATIVE_EXPORT(DosSetFilePtr, 256),
LX_NATIVE_EXPORT(DosClose, 257),
LX_NATIVE_EXPORT(DosDelete, 259),
LX_NATIVE_EXPORT(DosFindClose, 263),
LX_NATIVE_EXPORT(DosFindFirst, 264),
LX_NATIVE_EXPORT(DosFindNext, 265),
LX_NATIVE_EXPORT(DosSetFileSize, 272),
LX_NATIVE_EXPORT(DosOpen, 273),
LX_NATIVE_EXPORT(DosQueryCurrentDir, 274),
LX_NATIVE_EXPORT(DosQueryCurrentDisk, 275),
LX_NATIVE_EXPORT(DosQueryFHState, 276),
LX_NATIVE_EXPORT(DosQueryFSAttach, 277),
LX_NATIVE_EXPORT(DosQueryFileInfo, 279),
LX_NATIVE_EXPORT(DosWaitChild, 280),
LX_NATIVE_EXPORT(DosRead, 281),
LX_NATIVE_EXPORT(DosWrite, 282),
LX_NATIVE_EXPORT(DosExecPgm, 283),
LX_NATIVE_EXPORT(DosSetProcessCp, 289),
LX_NATIVE_EXPORT(DosQueryCp, 291),
LX_NATIVE_EXPORT(DosExitList, 296),
LX_NATIVE_EXPORT(DosAllocMem, 299),
LX_NATIVE_EXPORT(DosFreeMem, 304),
LX_NATIVE_EXPORT(DosSetMem, 305),
LX_NATIVE_EXPORT(DosCreateThread, 311),
LX_NATIVE_EXPORT(DosGetInfoBlocks, 312),
LX_NATIVE_EXPORT(DosLoadModule, 318),
LX_NATIVE_EXPORT(DosQueryModuleHandle, 319),
LX_NATIVE_EXPORT(DosQueryModuleName, 320),
LX_NATIVE_EXPORT(DosQueryProcAddr, 321),
LX_NATIVE_EXPORT(DosQueryAppType, 323),
LX_NATIVE_EXPORT(DosCreateEventSem, 324),
LX_NATIVE_EXPORT(DosCloseEventSem, 326),
LX_NATIVE_EXPORT(DosResetEventSem, 327),
LX_NATIVE_EXPORT(DosPostEventSem, 328),
LX_NATIVE_EXPORT(DosWaitEventSem, 329),
LX_NATIVE_EXPORT(DosQueryEventSem, 330),
LX_NATIVE_EXPORT(DosCreateMutexSem, 331),
LX_NATIVE_EXPORT(DosCloseMutexSem, 333),
LX_NATIVE_EXPORT(DosRequestMutexSem, 334),
LX_NATIVE_EXPORT(DosReleaseMutexSem, 335),
LX_NATIVE_EXPORT(DosSubSetMem, 344),
LX_NATIVE_EXPORT(DosSubAllocMem, 345),
LX_NATIVE_EXPORT(DosSubFreeMem, 346),
LX_NATIVE_EXPORT(DosQuerySysInfo, 348),
LX_NATIVE_EXPORT(DosWaitThread, 349),
LX_NATIVE_EXPORT(DosSetExceptionHandler, 354),
LX_NATIVE_EXPORT(DosUnsetExceptionHandler, 355),
LX_NATIVE_EXPORT(DosQuerySysState, 368),
LX_NATIVE_EXPORT(DosSetSignalExceptionFocus, 378),
LX_NATIVE_EXPORT(DosEnterMustComplete, 380),
LX_NATIVE_EXPORT(DosExitMustComplete, 381),
LX_NATIVE_EXPORT(DosSetRelMaxFH, 382),
LX_NATIVE_EXPORT(DosFlatToSel, 425),
LX_NATIVE_EXPORT(DosSelToFlat, 426),
LX_NATIVE_EXPORT(DosAllocThreadLocalMemory, 454),
LX_NATIVE_EXPORT(DosFreeThreadLocalMemory, 455),
LX_NATIVE_EXPORT(DosR3ExitAddr, 553),
LX_NATIVE_EXPORT(DosQueryHeaderInfo, 582),
LX_NATIVE_EXPORT(DosQueryExtLIBPATH, 874),
LX_NATIVE_EXPORT(DosQueryThreadContext, 877),
LX_NATIVE_EXPORT(DosOpenL, 981)
LX_NATIVE_MODULE_INIT_END()

#endif /* LX_LEGACY */

/* end of doscalls-lx.h ... */

0 comments on commit 6821de5

Please sign in to comment.