Skip to content

Commit

Permalink
CogVM source as per VMMaker.oscog-eem.3375
Browse files Browse the repository at this point in the history 
Cleanups:
fix all (clang) format warnings in the 64-bit cointerpreter and cogit.
Rewrite SocketPlugin>>#intToNetAddress: to avoid asCharPtr.

SocketPlugin
Fix a few unchecked invocations of socketValueOf:. Simplify some methods
to remove variables.
  • Loading branch information
@eliotmiranda
eliotmiranda committed May 13, 2024
1 parent 7724918 commit 15b25fa
Show file tree
Hide file tree
Showing 64 changed files with 1,358 additions and 1,459 deletions.
54 changes: 25 additions & 29 deletions src/plugins/SocketPlugin/SocketPlugin.c
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* Automatically generated by
SmartSyntaxPluginCodeGenerator VMMaker.oscog-mt.3362 uuid: b8f74e14-6430-924d-93fb-2fc1cd50ba34
SmartSyntaxPluginCodeGenerator VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a
from
SocketPlugin VMMaker.oscog-mt.3362 uuid: b8f74e14-6430-924d-93fb-2fc1cd50ba34
SocketPlugin VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a
*/
static char __buildInfo[] = "SocketPlugin VMMaker.oscog-mt.3362 uuid: b8f74e14-6430-924d-93fb-2fc1cd50ba34 " __DATE__ ;
static char __buildInfo[] = "SocketPlugin VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a " __DATE__ ;


#include "config.h"
Expand Down Expand Up @@ -198,7 +198,7 @@ extern sqInt trueObject(void);
extern
#endif
struct VirtualMachine* interpreterProxy;
static const char *moduleName = "SocketPlugin VMMaker.oscog-mt.3362 " INT_EXT;
static const char *moduleName = "SocketPlugin VMMaker.oscog-eem.3375 " INT_EXT;
static void * sCCLOPfn;
static void * sCCSOTfn;
static void * sCCTPfn;
Expand Down Expand Up @@ -240,15 +240,15 @@ initialiseModule(void)
static sqInt
intToNetAddress(sqInt addr)
{
char *naPtr;
unsigned char *naPtr;
sqInt netAddressOop;

netAddressOop = instantiateClassindexableSize(classByteArray(), 4);
naPtr = ((char *)firstIndexableField(netAddressOop));
naPtr[0] = (((char) ((((usqInt)(addr)) >> 24) & 0xFF)));
naPtr[1] = (((char) ((((usqInt)(addr)) >> 16) & 0xFF)));
naPtr[2] = (((char) ((((usqInt)(addr)) >> 8) & 0xFF)));
naPtr[3] = (((char) (addr & 0xFF)));
naPtr = ((unsigned char *) (firstIndexableField(netAddressOop)));
naPtr[0] = ((((usqInt)(addr)) >> 24) & 0xFF);
naPtr[1] = ((((usqInt)(addr)) >> 16) & 0xFF);
naPtr[2] = ((((usqInt)(addr)) >> 8) & 0xFF);
naPtr[3] = (addr & 0xFF);
return netAddressOop;
}

Expand Down Expand Up @@ -334,7 +334,7 @@ primitiveResolverAddressLookupResult(void)
sz = sqResolverAddrLookupResultSize();
if (!(failed())) {
s = instantiateClassindexableSize(classString(), sz);
sqResolverAddrLookupResult(((char *)firstIndexableField(s)), sz);
sqResolverAddrLookupResult(((char *)(firstIndexableField(s))), sz);
}
if (!(failed())) {
methodReturnValue(s);
Expand Down Expand Up @@ -634,15 +634,11 @@ primitiveResolverHostNameSize(void)
EXPORT(sqInt)
primitiveResolverLocalAddress(void)
{
sqInt addr;
sqInt _return_value;

addr = sqResolverLocalAddress();
_return_value = intToNetAddress(sqResolverLocalAddress());
if (!(failed())) {
_return_value = intToNetAddress(addr);
if (!(failed())) {
methodReturnValue(_return_value);
}
methodReturnValue(_return_value);
}
return null;
}
Expand All @@ -651,15 +647,11 @@ primitiveResolverLocalAddress(void)
EXPORT(sqInt)
primitiveResolverNameLookupResult(void)
{
sqInt addr;
sqInt _return_value;

addr = sqResolverNameLookupResult();
_return_value = intToNetAddress(sqResolverNameLookupResult());
if (!(failed())) {
_return_value = intToNetAddress(addr);
if (!(failed())) {
methodReturnValue(_return_value);
}
methodReturnValue(_return_value);
}
return null;
}
Expand Down Expand Up @@ -1616,7 +1608,6 @@ primitiveSocketListenWithOrWithoutBacklog(void)
EXPORT(sqInt)
primitiveSocketLocalAddress(void)
{
sqInt addr;
SocketPtr s;
sqInt socket;
sqInt _return_value;
Expand All @@ -1631,12 +1622,15 @@ primitiveSocketLocalAddress(void)
primitiveFailFor(PrimErrBadArgument);
s = null;
}
addr = sqSocketLocalAddress(s);
if (!(failed())) {
_return_value = intToNetAddress(addr);
_return_value = intToNetAddress(sqSocketLocalAddress(s));
if (!(failed())) {
methodReturnValue(_return_value);
}
return null;
}
if (!(failed())) {
pop(1);
}
return null;
}
Expand Down Expand Up @@ -1901,7 +1895,6 @@ primitiveSocketReceiveUDPDataBufCount(void)
EXPORT(sqInt)
primitiveSocketRemoteAddress(void)
{
sqInt addr;
SocketPtr s;
sqInt socket;
sqInt _return_value;
Expand All @@ -1916,12 +1909,15 @@ primitiveSocketRemoteAddress(void)
primitiveFailFor(PrimErrBadArgument);
s = null;
}
addr = sqSocketRemoteAddress(s);
if (!(failed())) {
_return_value = intToNetAddress(addr);
_return_value = intToNetAddress(sqSocketRemoteAddress(s));
if (!(failed())) {
methodReturnValue(_return_value);
}
return null;
}
if (!(failed())) {
pop(1);
}
return null;
}
Expand Down
2 changes: 1 addition & 1 deletion src/spur32.cog.lowcode/cogit.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
CCodeGenerator VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a
*/


Expand Down
14 changes: 7 additions & 7 deletions src/spur32.cog.lowcode/cogitARMv5.c
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
CCodeGenerator VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a
from
StackToRegisterMappingCogit VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
StackToRegisterMappingCogit VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a
*/
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875 " __DATE__ ;
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;


Expand Down Expand Up @@ -15303,10 +15303,10 @@ printTrampolineTable(void)
sqInt i;

for (i = 0; i < trampolineTableIndex; i += 2) {
printHex(((sqInt)(trampolineAddresses[i + 1])));
print(": ");
print(((char *) (trampolineAddresses[i])));
cr();
fprintf(getTranscript(),
"%p: %s\n",
((void *)(trampolineAddresses[i + 1])),
((char *)(trampolineAddresses[i])));
}
}

Expand Down
14 changes: 7 additions & 7 deletions src/spur32.cog.lowcode/cogitIA32.c
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
/* Automatically generated by
CCodeGenerator VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
CCodeGenerator VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a
from
StackToRegisterMappingCogit VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875
StackToRegisterMappingCogit VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a
*/
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3347 uuid: 7e4df21b-b561-434b-b2d3-45e8806d7875 " __DATE__ ;
static char __buildInfo[] = "StackToRegisterMappingCogit VMMaker.oscog-eem.3375 uuid: f5ac2627-c6fa-4468-b11e-a67fde7fb22a " __DATE__ ;
char *__cogitBuildInfo = __buildInfo;


Expand Down Expand Up @@ -14880,10 +14880,10 @@ printTrampolineTable(void)
sqInt i;

for (i = 0; i < trampolineTableIndex; i += 2) {
printHex(((sqInt)(trampolineAddresses[i + 1])));
print(": ");
print(((char *) (trampolineAddresses[i])));
cr();
fprintf(getTranscript(),
"%p: %s\n",
((void *)(trampolineAddresses[i + 1])),
((char *)(trampolineAddresses[i])));
}
}

Expand Down
Loading

0 comments on commit 15b25fa

Please sign in to comment.