windows

Author: moon-chilled

dllsrc/jdll.c

@@ -736,20 +736,19 @@ void getpath(HINSTANCE hi, C* path)
 // create a skeletal JS--just good enough to do basic initialisation
 JS heapinit()
 {
- JS jt=jmreserve(sizeof(JST),__builtin_ctz(JTALIGNBDY));
- if(!jt)R 0; //no address space
- I sz=(I)&jt->threaddata[2]-(I)jt; // #relevant bytes: just JS and the first JT
- if(!jmcommit(jt,sz)){jmrelease(jt,sizeof(JST));R 0;} //no memory
-	mvc(sz,jt,1,MEMSET00);
- R jt;
+	JS jt=jmreservea(sizeof(JST),__builtin_ctz(JTALIGNBDY));
+	if(!jt)R 0; //no address space
+	I sz=(I)&jt->threaddata[1]-(I)jt; // #relevant bytes: just JS and the first JT
+	if(!jmcommit(jt,sz)){jmrelease(jt,sizeof(JST));R 0;} //no memory
+	R jt;
 }
 
 int WINAPI DllMain (HINSTANCE hDLL, DWORD dwReason, LPVOID lpReserved)
 {
 	switch (dwReason)
 	{
-    case DLL_PROCESS_ATTACH:
-        // Handle the first activation of J
+	case DLL_PROCESS_ATTACH:
+	// Handle the first activation of J
 		g_hinst = hDLL;
 /*
 		{
@@ -768,11 +767,9 @@ int WINAPI DllMain (HINSTANCE hDLL, DWORD dwReason, LPVOID lpReserved)
         // just enough to do GA().  The rest of jt is never used
 		getpath(0, modulepath);
 		getpath(hDLL, dllpath);
-		g_jt=heapinit()
+		g_jt=heapinit();
 		if(!g_jt) R 0;   // abort if no memory
 		if(!jtglobinit(g_jt)) {jmrelease(g_jt,sizeof(JST)); g_jt=0; R 0;};  // free & abort if initialization error
-        // The g_jt heap MUST NOT be freed, because it holds the blocks pointed to by initialized globals.
-        // g_jt itself, a JST struct, is not used.  Perhaps it could be freed, as long as the rest of the heap remains.
 		break;
 
     case DLL_THREAD_ATTACH:
@@ -792,14 +789,14 @@ CDPROC JS _stdcall JInit()
 {
 	JST* jt;
 
-    // Init for a new J instance.  Globals have already been initialized.
-    // Create a new jt, which will be the one we use for the entirety of the instance.
-	jt=heapinit(1000000);
+	// Init for a new J instance.  Globals have already been initialized.
+	// Create a new jt, which will be the one we use for the entirety of the instance.
+	jt=heapinit();
 	if(!jt) R 0;  // if no memory, fail
-    // Initialize all the info for the shared region and the master thread
+	// Initialize all the info for the shared region and the master thread
 	if(!jtjinit2(jt,0,0))
 	{
-		HeapDestroy(JT(jt,heap));  // if error during init, fail
+		jmrelease(jt,sizeof(JST));  // if error during init, fail
 		R 0;
 	};
 	return jt;  // return (JS)MTHREAD(jt);
@@ -809,11 +806,11 @@ CDPROC JS _stdcall JInit()
 CDPROC int _stdcall JFree(JS jt)
 {
 	if(!jt) return 0;
- SETJTJM(jt,jt,jm)
+	SETJTJM(jt,jt,jm)
 #if !SY_WINCE
 	dllquit(jm);  // clean up call dll
 #endif
-	HeapDestroy(JT(jt,heap));
+	jmrelease(jt,sizeof(JST));
 	return 0;
 }
 

jsrc/m.c

@@ -116,7 +116,7 @@ void *jmreservea(I n,I a){
 void *jmalloca(I n,I a){
  MEM_ADDRESS_REQUIREMENTS req = {.Alignment=1<<a};
  MEM_EXTENDED_PARAMETER opt = {.Type=MemExtendedParameterAddressRequirements, .Pointer=&req};
- R VirtualAlloc2(0,0,n,MEM_RESERVE|MM_COMMIT,PAGE_READWRITE,&opt,1);}
+ R VirtualAlloc2(0,0,n,MEM_RESERVE|MEM_COMMIT,PAGE_READWRITE,&opt,1);}
 #endif
 
 #if LEAKSNIFF

makemsvc/jdll/makefile

@@ -57,7 +57,7 @@ endif
 ifeq (1,${x64})
 CF1= -maes -msse3 -fno-strict-aliasing -Wno-unknown-warning-option -Wsign-compare -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-char-subscripts -Wno-pointer-to-int-cast -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor
 CFLAGS= ${FDEBUG} /D_JDLL /DC_NA=0 /DEMU_AVX=1 ${FAVX} ${FAVX2} ${FAVX512} ${FOPENMP} ${FSLEEF} ${FNOSYNCHLIB} ${FBOXEDSPARSE} ${PTHREADINC} /WX /W3 /O2 /GS- /Zc:strictStrings /D_USING_V110_SDK71_ /D_CRT_SECURE_NO_WARNINGS /MT ${CF1}
-FLAGS= ${LDEBUG} /DLL /MACHINE:X64 /SUBSYSTEM:WINDOWS,5.02
+FLAGS= ${LDEBUG} /DLL /MACHINE:X64 /SUBSYSTEM:WINDOWS,10.0
 ASMFLAGS= /Cx
 else
 CF1= -m32 -maes -msse2 -fno-strict-aliasing -Wno-unknown-warning-option -Wsign-compare -Wno-parentheses -Wno-unused-variable -Wno-pointer-sign -Wno-missing-braces -Wno-missing-field-initializers -Wno-char-subscripts -Wno-pointer-to-int-cast -Wno-unused-but-set-variable -Wno-unused-value -Wno-unused-function -Wno-empty-body -Wno-sometimes-uninitialized -Wno-string-plus-int -Wno-unknown-pragmas -Wno-delete-non-abstract-non-virtual-dtor