Round up the result of sbrk (used for the hint to the initial mmap for Spur) to

eliotmiranda · eliotmiranda · commit aba9cd3f1894 · 2024-02-12T15:37:46.000-08:00
a page boundary.
diff --git a/image/Slang Test Workspace.text b/image/Slang Test Workspace.text
@@ -1 +1 @@
-"Here are some doits to get Slang to generate a single method to the transcript"[Transcript show: [| sel vmm s cg |	sel := #scavenge:.	vmm := (VMMaker forPlatform: 'Cross')				interpreterClass: StackInterpreter;				options: #(ObjectMemory Spur64BitCoMemoryManager).	cg := [vmm buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	"to break at inlining decisions or type inferrence uncomment the following.	 If src & dest are different selectors, breaks on inlining.	 If src & dest are the same selector, breaks on type inference in sel."	"cg	breakSrcInlineSelector: sel;		breakDestInlineSelector: sel;		breakOnInline: false".	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode'])		ifTrue: [cg doBasicInlining: true]		ifFalse: [cg doInlining: true].	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| sel vmm s cg |	sel := #primitiveVoidVMStateForMethod.	vmm := (VMMaker forPlatform: 'Cross')				interpreterClass: CoInterpreter"MT";				options: {#Cogit. Cogit chooseCogitClass name}.	cg := [vmm buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode'])		ifTrue: [cg doBasicInlining: true]		ifFalse: [cg doInlining: true].	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| sel s vmm cg |	sel := #compileEntry.	vmm := VMMaker forPlatform: 'Cross'.	cg := [vmm				interpreterClass: CoInterpreter;				options: {#Cogit. Cogit chooseCogitClass name};				buildCodeGeneratorForCogit]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { #compactCogCompiledCode. sel }.	cg prepareMethods.	cg doInlining: cg vmClass doInlining.	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| tm s vmm cg |	vmm := VMMaker forPlatform: 'Cross'.	cg := [vmm				interpreterClass: StackInterpreter;				buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	tm := (StackInterpreter compile: 'foo self cppIf: ''ARBITRARY'' ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']. self cppIf: (self cCode: ''ARBITRARY'') ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']' classified: nil notifying: nil trailer: CompiledMethodTrailer empty ifFail: []) node asTranslationMethodOfClass: cg translationMethodClass.	cg addMethod: tm.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { #foo }.	cg prepareMethods.	cg doInlining: true.	s := ReadWriteStream on: String new.	(cg methodNamed: #foo)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| plugin sel s vmm cg |	plugin := ThreadedARMFFIPlugin.	sel := #primitiveCallout.	vmm := VMMaker forPlatform: 'Cross'.	cg := [plugin buildCodeGenerator]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg	breakSrcInlineSelector: #cdigitMontgomery:len:times:len:modulo:len:mInvModB:into:;		breakDestInlineSelector: sel;		breakOnInline: "false"true.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	cg doInlining: true.	s := ReadWriteStream on: String new.	(cg anyMethodNamed: sel)		removeUnusedTempsAndNilIfRequiredIn: cg;		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| plugin s cg |	plugin := FileCopyPlugin"UnixOSProcessPlugin".	cg := plugin buildCodeGenerator.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	plugin pruneUnusedInterpreterPluginMethodsIn: cg.	s := ReadWriteStream on: String new.	cg emitCCodeOn: s doInlining: true doAssertions: false.	s contents] value].[| cg |cg := BitBltSimulation buildCodeGeneratorUpTo: BitBltSimulation.cg inferTypesForImplicitlyTypedVariablesAndMethods].
+"Here are some doits to get Slang to generate a single method to the transcript"[Transcript show: [| sel vmm s cg |	sel := #scavenge:.	vmm := (VMMaker forPlatform: 'Cross')				interpreterClass: StackInterpreter;				options: #(ObjectMemory Spur64BitCoMemoryManager).	cg := [vmm buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	"to break at inlining decisions or type inferrence uncomment the following.	 If src & dest are different selectors, breaks on inlining.	 If src & dest are the same selector, breaks on type inference in sel."	"cg	breakSrcInlineSelector: sel;		breakDestInlineSelector: sel;		breakOnInline: false".	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode'])		ifTrue: [cg doBasicInlining: true]		ifFalse: [cg doInlining: true].	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| sel vmm s cg |	sel := #initializeThreadState"populate:from:to:".	vmm := (VMMaker forPlatform: 'Cross')				interpreterClass: CoInterpreterMT;				options: {ObjectMemory. Spur64BitCoMemoryManager. #Cogit. Cogit chooseCogitClass name}.	cg := [vmm buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode'])		ifTrue: [cg doBasicInlining: true]		ifFalse: [cg doInlining: true].	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| sel s vmm cg |	sel := #compileEntry.	vmm := VMMaker forPlatform: 'Cross'.	cg := [vmm				interpreterClass: CoInterpreter;				options: {#Cogit. Cogit chooseCogitClass name};				buildCodeGeneratorForCogit]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { #compactCogCompiledCode. sel }.	cg prepareMethods.	cg doInlining: cg vmClass doInlining.	s := ReadWriteStream on: String new.	(cg methodNamed: sel)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| tm s vmm cg |	vmm := VMMaker forPlatform: 'Cross'.	cg := [vmm				interpreterClass: StackInterpreter;				buildCodeGeneratorForInterpreter]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg vmClass preGenerationHook: cg.	tm := (StackInterpreter compile: 'foo self cppIf: ''ARBITRARY'' ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']. self cppIf: (self cCode: ''ARBITRARY'') ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']' classified: nil notifying: nil trailer: CompiledMethodTrailer empty ifFail: []) node asTranslationMethodOfClass: cg translationMethodClass.	cg addMethod: tm.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { #foo }.	cg prepareMethods.	cg doInlining: true.	s := ReadWriteStream on: String new.	(cg methodNamed: #foo)		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| plugin sel s vmm cg |	plugin := ThreadedARMFFIPlugin.	sel := #primitiveCallout.	vmm := VMMaker forPlatform: 'Cross'.	cg := [plugin buildCodeGenerator]			on: Notification			do: [:ex|				ex tag == #getVMMaker					ifTrue: [ex resume: vmm]					ifFalse: [ex pass]].	cg	breakSrcInlineSelector: #cdigitMontgomery:len:times:len:modulo:len:mInvModB:into:;		breakDestInlineSelector: sel;		breakOnInline: "false"true.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	cg retainMethods: { sel }.	cg prepareMethods.	cg doInlining: true.	s := ReadWriteStream on: String new.	(cg anyMethodNamed: sel)		removeUnusedTempsAndNilIfRequiredIn: cg;		halt;		emitCCodeOn: s generator: cg.	s contents] value].[Transcript show: [| plugin s cg |	plugin := FileCopyPlugin"UnixOSProcessPlugin".	cg := plugin buildCodeGenerator.	cg inferTypesForImplicitlyTypedVariablesAndMethods.	plugin pruneUnusedInterpreterPluginMethodsIn: cg.	s := ReadWriteStream on: String new.	cg emitCCodeOn: s doInlining: true doAssertions: false.	s contents] value].[| cg |cg := BitBltSimulation buildCodeGeneratorUpTo: BitBltSimulation.cg inferTypesForImplicitlyTypedVariablesAndMethods].
diff --git a/platforms/unix/vm/sqUnixSpurMemory.c b/platforms/unix/vm/sqUnixSpurMemory.c
@@ -106,6 +106,10 @@ int mmapErrno = 0;
 static int min(int x, int y) { return (x < y) ? x : y; }
 static int max(int x, int y) { return (x > y) ? x : y; }
 
+// a hint of the lowest possible address for mmap
+#define lowestPageAlignedAddressForMMap() \
+	(assert(pageSize), (void *)roundUpToPage((usqInt)sbrk(0)))
+
 /* Answer the address of minHeapSize rounded up to page size bytes of memory. */
 
 #if COGVM
@@ -127,7 +131,7 @@ sqAllocateMemory(usqInt minHeapSize, usqInt desiredHeapSize)
 	pageSize = getpagesize();
 	pageMask = ~(pageSize - 1);
 
-	hint = sbrk(0);
+	hint = lowestPageAlignedAddressForMMap();
 #else
 	assert(pageSize != 0 && pageMask != 0);
 	hint = endOfJITZone;
@@ -275,12 +279,14 @@ sqMakeMemoryExecutableFromToCodeToDataDelta(usqInt startAddr,
 void *
 allocateJITMemory(usqInt *desiredSize)
 {
-	void *hint = sbrk(0); // a hint of the lowest possible address for mmap
+	void *hint; // a hint of the lowest possible address for mmap
 	void *result;
 
 	pageSize = getpagesize();
 	pageMask = ~(pageSize - 1);
 
+	hint = lowestPageAlignedAddressForMMap();
+
 #if !defined(MAP_JIT)
 # define MAP_JIT 0
 #endif

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-"Here are some doits to get Slang to generate a single method to the transcript"[Transcript show: [\| sel vmm s cg \| sel := #scavenge:. vmm := (VMMaker forPlatform: 'Cross') interpreterClass: StackInterpreter; options: #(ObjectMemory Spur64BitCoMemoryManager). cg := [vmm buildCodeGeneratorForInterpreter] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. "to break at inlining decisions or type inferrence uncomment the following. If src & dest are different selectors, breaks on inlining. If src & dest are the same selector, breaks on type inference in sel." "cg breakSrcInlineSelector: sel; breakDestInlineSelector: sel; breakOnInline: false". cg vmClass preGenerationHook: cg. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { sel }. cg prepareMethods. ((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode']) ifTrue: [cg doBasicInlining: true] ifFalse: [cg doInlining: true]. s := ReadWriteStream on: String new. (cg methodNamed: sel) halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| sel vmm s cg \| sel := #primitiveVoidVMStateForMethod. vmm := (VMMaker forPlatform: 'Cross') interpreterClass: CoInterpreter"MT"; options: {#Cogit. Cogit chooseCogitClass name}. cg := [vmm buildCodeGeneratorForInterpreter] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. cg vmClass preGenerationHook: cg. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { sel }. cg prepareMethods. ((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode']) ifTrue: [cg doBasicInlining: true] ifFalse: [cg doInlining: true]. s := ReadWriteStream on: String new. (cg methodNamed: sel) halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| sel s vmm cg \| sel := #compileEntry. vmm := VMMaker forPlatform: 'Cross'. cg := [vmm interpreterClass: CoInterpreter; options: {#Cogit. Cogit chooseCogitClass name}; buildCodeGeneratorForCogit] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. cg vmClass preGenerationHook: cg. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { #compactCogCompiledCode. sel }. cg prepareMethods. cg doInlining: cg vmClass doInlining. s := ReadWriteStream on: String new. (cg methodNamed: sel) halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| tm s vmm cg \| vmm := VMMaker forPlatform: 'Cross'. cg := [vmm interpreterClass: StackInterpreter; buildCodeGeneratorForInterpreter] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. cg vmClass preGenerationHook: cg. tm := (StackInterpreter compile: 'foo self cppIf: ''ARBITRARY'' ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']. self cppIf: (self cCode: ''ARBITRARY'') ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']' classified: nil notifying: nil trailer: CompiledMethodTrailer empty ifFail: []) node asTranslationMethodOfClass: cg translationMethodClass. cg addMethod: tm. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { #foo }. cg prepareMethods. cg doInlining: true. s := ReadWriteStream on: String new. (cg methodNamed: #foo) halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| plugin sel s vmm cg \| plugin := ThreadedARMFFIPlugin. sel := #primitiveCallout. vmm := VMMaker forPlatform: 'Cross'. cg := [plugin buildCodeGenerator] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. cg breakSrcInlineSelector: #cdigitMontgomery:len:times:len:modulo:len:mInvModB:into:; breakDestInlineSelector: sel; breakOnInline: "false"true. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { sel }. cg prepareMethods. cg doInlining: true. s := ReadWriteStream on: String new. (cg anyMethodNamed: sel) removeUnusedTempsAndNilIfRequiredIn: cg; halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| plugin s cg \| plugin := FileCopyPlugin"UnixOSProcessPlugin". cg := plugin buildCodeGenerator. cg inferTypesForImplicitlyTypedVariablesAndMethods. plugin pruneUnusedInterpreterPluginMethodsIn: cg. s := ReadWriteStream on: String new. cg emitCCodeOn: s doInlining: true doAssertions: false. s contents] value].[\| cg \|cg := BitBltSimulation buildCodeGeneratorUpTo: BitBltSimulation.cg inferTypesForImplicitlyTypedVariablesAndMethods].
	`1`	+"Here are some doits to get Slang to generate a single method to the transcript"[Transcript show: [\| sel vmm s cg \| sel := #scavenge:. vmm := (VMMaker forPlatform: 'Cross') interpreterClass: StackInterpreter; options: #(ObjectMemory Spur64BitCoMemoryManager). cg := [vmm buildCodeGeneratorForInterpreter] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. "to break at inlining decisions or type inferrence uncomment the following. If src & dest are different selectors, breaks on inlining. If src & dest are the same selector, breaks on type inference in sel." "cg breakSrcInlineSelector: sel; breakDestInlineSelector: sel; breakOnInline: false". cg vmClass preGenerationHook: cg. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { sel }. cg prepareMethods. ((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode']) ifTrue: [cg doBasicInlining: true] ifFalse: [cg doInlining: true]. s := ReadWriteStream on: String new. (cg methodNamed: sel) halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| sel vmm s cg \| sel := #initializeThreadState"populate:from:to:". vmm := (VMMaker forPlatform: 'Cross') interpreterClass: CoInterpreterMT; options: {ObjectMemory. Spur64BitCoMemoryManager. #Cogit. Cogit chooseCogitClass name}. cg := [vmm buildCodeGeneratorForInterpreter] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. cg vmClass preGenerationHook: cg. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { sel }. cg prepareMethods. ((sel beginsWith: 'bytecode') or: [sel endsWith: 'Bytecode']) ifTrue: [cg doBasicInlining: true] ifFalse: [cg doInlining: true]. s := ReadWriteStream on: String new. (cg methodNamed: sel) halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| sel s vmm cg \| sel := #compileEntry. vmm := VMMaker forPlatform: 'Cross'. cg := [vmm interpreterClass: CoInterpreter; options: {#Cogit. Cogit chooseCogitClass name}; buildCodeGeneratorForCogit] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. cg vmClass preGenerationHook: cg. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { #compactCogCompiledCode. sel }. cg prepareMethods. cg doInlining: cg vmClass doInlining. s := ReadWriteStream on: String new. (cg methodNamed: sel) halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| tm s vmm cg \| vmm := VMMaker forPlatform: 'Cross'. cg := [vmm interpreterClass: StackInterpreter; buildCodeGeneratorForInterpreter] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. cg vmClass preGenerationHook: cg. tm := (StackInterpreter compile: 'foo self cppIf: ''ARBITRARY'' ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']. self cppIf: (self cCode: ''ARBITRARY'') ifTrue: [self cCode: ''arbi''] ifFalse: [self cCode: ''trary'']' classified: nil notifying: nil trailer: CompiledMethodTrailer empty ifFail: []) node asTranslationMethodOfClass: cg translationMethodClass. cg addMethod: tm. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { #foo }. cg prepareMethods. cg doInlining: true. s := ReadWriteStream on: String new. (cg methodNamed: #foo) halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| plugin sel s vmm cg \| plugin := ThreadedARMFFIPlugin. sel := #primitiveCallout. vmm := VMMaker forPlatform: 'Cross'. cg := [plugin buildCodeGenerator] on: Notification do: [:ex\| ex tag == #getVMMaker ifTrue: [ex resume: vmm] ifFalse: [ex pass]]. cg breakSrcInlineSelector: #cdigitMontgomery:len:times:len:modulo:len:mInvModB:into:; breakDestInlineSelector: sel; breakOnInline: "false"true. cg inferTypesForImplicitlyTypedVariablesAndMethods. cg retainMethods: { sel }. cg prepareMethods. cg doInlining: true. s := ReadWriteStream on: String new. (cg anyMethodNamed: sel) removeUnusedTempsAndNilIfRequiredIn: cg; halt; emitCCodeOn: s generator: cg. s contents] value].[Transcript show: [\| plugin s cg \| plugin := FileCopyPlugin"UnixOSProcessPlugin". cg := plugin buildCodeGenerator. cg inferTypesForImplicitlyTypedVariablesAndMethods. plugin pruneUnusedInterpreterPluginMethodsIn: cg. s := ReadWriteStream on: String new. cg emitCCodeOn: s doInlining: true doAssertions: false. s contents] value].[\| cg \|cg := BitBltSimulation buildCodeGeneratorUpTo: BitBltSimulation.cg inferTypesForImplicitlyTypedVariablesAndMethods].