Vm-dev November 2011

vm-dev@lists.squeakfoundation.org

20 participants
52 discussions

VM Maker: VMMaker.oscog-eem.138.mcz
by commits＠source.squeak.org 18 Nov '11

18 Nov '11

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.138.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.138 Author: eem Time: 17 November 2011, 4:02:46.915 pm UUID: f9a63bdf-7bbc-4ae5-9634-ecd6fd814c9d Ancestors: VMMaker.oscog-eem.137 Fix frameless foo: arg instVar := instVar code gen bug (failure to pop spills on frameless return). Correct receivers of noAssertMethodClassAssociationOf: for simulation (starting up a Newspeak image). Bring CurrentImageCoInterpreterFacade up to date for simulation. Bring NewCoObjectMemorySimulator up to date for simulation. Make Alien plugins simulate data manipulation calls. Use more hex printing in frame/oop printing. Log time without milliseconds. =============== Diff against VMMaker.oscog-eem.137 =============== Item was changed: ----- Method: CogMethodZone>>compactCompiledCode: (in category 'compaction') ----- compactCompiledCode: objectHeaderValue | source dest bytes | <var: #source type: #'CogMethod *'> <var: #dest type: #'CogMethod *'> source := coInterpreter cCoerceSimple: baseAddress to: #'CogMethod *'. openPICList := nil. [source < self limitZony and: [source cmType ~= CMFree]] whileTrue: [self assert: (cogit cogMethodDoesntLookKosher: source) = 0. source objectHeader: objectHeaderValue. source cmUsageCount > 0 ifTrue: [source cmUsageCount: source cmUsageCount // 2]. source cmType = CMOpenPIC ifTrue: [source nextOpenPIC: openPICList asUnsignedInteger. openPICList := source]. source := self methodAfter: source]. source >= self limitZony ifTrue: [^self halt: 'no free methods; cannot compact.']. dest := source. [source < self limitZony] whileTrue: [self assert: (cogit maybeFreeCogMethodDoesntLookKosher: source) = 0. bytes := source blockSize. source cmType ~= CMFree ifTrue: [self mem: dest mo: source ve: bytes. dest objectHeader: objectHeaderValue. dest cmType = CMMethod ifTrue: ["For non-Newspeak there should ne a one-to-one mapping metween bytecoded and cog methods. For Newspeak not necessarily, but only for anonymous accessors." self assert: ((coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger + or: [(cogit noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject]). - or: [(coInterpreter noAssertMethodClassAssociationOf: dest methodObject) = objectMemory nilObject]). "Only update the original method's header if it is referring to this CogMethod." (coInterpreter rawHeaderOf: dest methodObject) asInteger = source asInteger ifTrue: [coInterpreter rawHeaderOf: dest methodObject put: dest asInteger]] ifFalse: [dest cmType = CMOpenPIC ifTrue: [dest nextOpenPIC: openPICList asUnsignedInteger. openPICList := dest]]. dest cmUsageCount > 0 ifTrue: [dest cmUsageCount: dest cmUsageCount // 2]. dest := coInterpreter cCoerceSimple: dest asInteger + bytes to: #'CogMethod *']. source := coInterpreter cCoerceSimple: source asInteger + bytes to: #'CogMethod *']. mzFreeStart := dest asInteger. methodBytesFreedSinceLastCompaction := 0! Item was removed: - ----- Method: CogVMSimulator>>printCallStackOf: (in category 'debug printing') ----- - printCallStackOf: aContext - self printCallStackOf: aContext currentFP: localFP! Item was changed: ----- Method: Cogit>>cog:selector: (in category 'jit - api') ----- cog: aMethodObj selector: aSelectorOop "Attempt to produce a machine code method for the bytecode method object aMethodObj. N.B. If there is no code memory available do *NOT* attempt to reclaim the method zone. Certain clients (e.g. ceSICMiss:) depend on the zone remaining constant across method generation." <api> <returnTypeC: #'CogMethod *'> | cogMethod | <var: #cogMethod type: #'CogMethod *'> self assert: ((coInterpreter methodHasCogMethod: aMethodObj) not + or: [(self noAssertMethodClassAssociationOf: aMethodObj) = objectMemory nilObject]). - or: [(coInterpreter noAssertMethodClassAssociationOf: aMethodObj) = objectMemory nilObject]). "coInterpreter stringOf: aSelectorOop" coInterpreter compilationBreak: aSelectorOop point: (objectMemory lengthOf: aSelectorOop). aMethodObj = breakMethod ifTrue: [self halt: 'Compilation of breakMethod']. self cppIf: NewspeakVM ifTrue: [cogMethod := methodZone findPreviouslyCompiledVersionOf: aMethodObj with: aSelectorOop. cogMethod ifNotNil: [(coInterpreter methodHasCogMethod: aMethodObj) not ifTrue: [self assert: (coInterpreter rawHeaderOf: aMethodObj) = cogMethod methodHeader. cogMethod methodObject: aMethodObj. coInterpreter rawHeaderOf: aMethodObj put: cogMethod asInteger]. ^cogMethod]]. methodObj := aMethodObj. cogMethod := self compileCogMethod: aSelectorOop. (cogMethod asInteger between: MaxNegativeErrorCode and: -1) ifTrue: [cogMethod asInteger >= MaxUnreportableError ifTrue: [cogMethod asInteger = InsufficientCodeSpace ifTrue: [coInterpreter callForCogCompiledCodeCompaction]] ifFalse: [self reportError: (self cCoerceSimple: cogMethod to: #sqInt)]. ^nil]. "self cCode: '' inSmalltalk: [coInterpreter printCogMethod: cogMethod. ""coInterpreter symbolicMethod: aMethodObj."" self assertValidMethodMap: cogMethod." "self disassembleMethod: cogMethod." "printInstructions := clickConfirm := true""]." ^cogMethod! Item was changed: ----- Method: Cogit>>mapObjectReferencesInMachineCodeForBecome (in category 'garbage collection') ----- mapObjectReferencesInMachineCodeForBecome "Update all references to objects in machine code for a become. Unlike incrementalGC or fullGC a method that does not refer to young may refer to young as a result of the become operation." | cogMethod hasYoungObj hasYoungObjPtr freedPIC | <var: #cogMethod type: #'CogMethod *'> hasYoungObj := false. hasYoungObjPtr := self cCode: [(self addressOf: hasYoungObj) asInteger] inSmalltalk: [CPluggableAccessor new setObject: nil; atBlock: [:obj :idx| hasYoungObj] atPutBlock: [:obj :idx :val| hasYoungObj := val]]. codeModified := freedPIC := false. self mapObjectReferencesInGeneratedRuntime. cogMethod := self cCoerceSimple: methodZoneBase to: #'CogMethod *'. [cogMethod < methodZone limitZony] whileTrue: [self assert: hasYoungObj not. cogMethod cmType ~= CMFree ifTrue: [self assert: (self cogMethodDoesntLookKosher: cogMethod) = 0. cogMethod selector: (objectRepresentation remapOop: cogMethod selector).. cogMethod cmType = CMClosedPIC ifTrue: [((objectMemory isYoung: cogMethod selector) or: [self mapObjectReferencesInClosedPIC: cogMethod]) ifTrue: [freedPIC := true. methodZone freeMethod: cogMethod]] ifFalse: [(objectMemory isYoung: cogMethod selector) ifTrue: [hasYoungObj := true]. cogMethod cmType = CMMethod ifTrue: [self assert: cogMethod objectHeader = objectMemory nullHeaderForMachineCodeMethod. cogMethod methodObject: (objectRepresentation remapOop: cogMethod methodObject). self assert: ((coInterpreter rawHeaderOf: cogMethod methodObject) = cogMethod asInteger + or: [(self noAssertMethodClassAssociationOf: cogMethod methodObject) - or: [(coInterpreter noAssertMethodClassAssociationOf: cogMethod methodObject) = objectMemory nilObject]). (objectMemory isYoung: cogMethod methodObject) ifTrue: [hasYoungObj := true]]. self mapFor: cogMethod performUntil: (self cppIf: NewspeakVM ifTrue: [#remapNSIfObjectRef:pc:hasYoung: asSymbol] ifFalse: [#remapIfObjectRef:pc:hasYoung: asSymbol]) arg: hasYoungObjPtr. hasYoungObj ifTrue: [cogMethod cmRefersToYoung ifFalse: [cogMethod cmRefersToYoung: true. methodZone addToYoungReferrers: cogMethod]. hasYoungObj := false] ifFalse: [cogMethod cmRefersToYoung: false]]]. cogMethod := methodZone methodAfter: cogMethod]. methodZone pruneYoungReferrers. freedPIC ifTrue: [self unlinkSendsToFree. codeModified := true]. codeModified ifTrue: "After updating oops in inline caches we need to flush the icache." [processor flushICacheFrom: codeBase to: methodZone limitZony asInteger]! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>interpretAddress (in category 'accessing') ----- + interpretAddress + ^self addressForLabel: #interpret! Item was added: + ----- Method: CurrentImageCoInterpreterFacade>>primitiveFailAddress (in category 'accessing') ----- + primitiveFailAddress + ^self addressForLabel: #primitiveFail! Item was changed: ----- Method: IA32ABIPlugin class>>simulatorClass (in category 'simulation only') ----- simulatorClass + ^NewspeakVM ifFalse: [IA32ABIPluginSimulator]! - ^IA32ABIPluginSimulator! Item was added: + ----- Method: IA32ABIPluginSimulator>>longAt: (in category 'memory access') ----- + longAt: byteAddress + ^interpreterProxy longAt: byteAddress! Item was added: + ----- Method: IA32ABIPluginSimulator>>longAt:put: (in category 'memory access') ----- + longAt: byteAddress put: a32BitValue + ^interpreterProxy longAt: byteAddress put: a32BitValue! Item was added: + ----- Method: NewCoObjectMemorySimulator class>>vmProxyMajorVersion (in category 'simulation only') ----- + vmProxyMajorVersion + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^CoInterpreter vmProxyMajorVersion! Item was added: + ----- Method: NewCoObjectMemorySimulator class>>vmProxyMinorVersion (in category 'simulation only') ----- + vmProxyMinorVersion + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^CoInterpreter vmProxyMinorVersion! Item was added: + ----- Method: NewCoObjectMemorySimulator>>internalIsImmutable: (in category 'simulation only') ----- + internalIsImmutable: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter internalIsImmutable: oop! Item was added: + ----- Method: NewCoObjectMemorySimulator>>methodReturnValue: (in category 'simulation only') ----- + methodReturnValue: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter methodReturnValue: oop! Item was added: + ----- Method: NewCoObjectMemorySimulator>>signed32BitIntegerFor: (in category 'simulation only') ----- + signed32BitIntegerFor: integerValue + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter signed32BitIntegerFor: integerValue! Item was added: + ----- Method: NewCoObjectMemorySimulator>>signed32BitValueOf: (in category 'simulation only') ----- + signed32BitValueOf: oop + "hack around the CoInterpreter/ObjectMemory split refactoring" + ^coInterpreter signed32BitValueOf: oop! Item was changed: ----- Method: NewspeakInterpreter>>shortPrintOop: (in category 'debug printing') ----- shortPrintOop: oop <inline: false> + self printHex: oop. - self printNum: oop. (self isIntegerObject: oop) ifTrue: [^self cCode: 'printf("=%ld\n", integerValueOf(oop))' inSmalltalk: [self print: (self shortPrint: oop); cr]]. (oop between: self startOfMemory and: freeBlock) ifFalse: [self printHex: oop; print: ' is not on the heap'; cr. ^nil]. (oop bitAnd: (BytesPerWord - 1)) ~= 0 ifTrue: [self printHex: oop; print: ' is misaligned'; cr. ^nil]. self print: ': a(n) '. self printNameOfClass: (self fetchClassOf: oop) count: 5. self cr! Item was changed: ----- Method: NewsqueakIA32ABIPlugin class>>simulatorClass (in category 'simulation only') ----- simulatorClass + ^NewspeakVM ifTrue: [NewsqueakIA32ABIPluginSimulator]! - ^NewsqueakIA32ABIPluginSimulator! Item was changed: + NewsqueakIA32ABIPlugin subclass: #NewsqueakIA32ABIPluginSimulator - IA32ABIPlugin subclass: #NewsqueakIA32ABIPluginSimulator instanceVariableNames: '' classVariableNames: '' poolDictionaries: '' category: 'VMMaker-Plugins-Alien'! Item was added: + ----- Method: NewsqueakIA32ABIPluginSimulator>>longAt: (in category 'memory access') ----- + longAt: byteAddress + ^interpreterProxy longAt: byteAddress! Item was added: + ----- Method: NewsqueakIA32ABIPluginSimulator>>longAt:put: (in category 'memory access') ----- + longAt: byteAddress put: a32BitValue + ^interpreterProxy longAt: byteAddress put: a32BitValue! Item was changed: ----- Method: StackInterpreter>>activeProcess (in category 'process primitive support') ----- activeProcess "Answer the current activeProcess." + <api> "useful for VM debugging" ^objectMemory fetchPointer: ActiveProcessIndex ofObject: self schedulerPointer! Item was added: + ----- Method: StackInterpreter>>internalIsImmutable: (in category 'object format') ----- + internalIsImmutable: oop + <option: #NewspeakVM> + <inline: true> + <export: true> + ^((objectMemory baseHeader: oop) bitAnd: ImmutabilityBit) ~= 0! Item was changed: ----- Method: StackInterpreter>>longPrintOop: (in category 'debug printing') ----- longPrintOop: oop <api> | fmt lastIndex startIP bytecodesPerLine | ((objectMemory isIntegerObject: oop) or: [(oop between: objectMemory startOfMemory and: objectMemory freeStart) not or: [(oop bitAnd: (BytesPerWord - 1)) ~= 0 or: [(objectMemory isFreeObject: oop) or: [(fmt := objectMemory formatOf: oop) between: 5 and: 11]]]]) ifTrue: [^self printOop: oop]. self printHex: oop; print: ': a(n) '; printNameOfClass: (objectMemory fetchClassOfNonInt: oop) count: 5. fmt > 4 ifTrue: [self print: ' nbytes '; printNum: (objectMemory byteSizeOf: oop)]. self cr. lastIndex := 64 min: (startIP := (objectMemory lastPointerOf: oop) / BytesPerWord). lastIndex > 0 ifTrue: [1 to: lastIndex do: [:index| | fieldOop | fieldOop := objectMemory fetchPointer: index - 1 ofObject: oop. self space; printHex: fieldOop; space; printOopShort: fieldOop; cr]]. (objectMemory isCompiledMethod: oop) ifFalse: [startIP > 64 ifTrue: [self print: '...'; cr]] ifTrue: [startIP := startIP * BytesPerWord + 1. lastIndex := objectMemory lengthOf: oop. + lastIndex - startIP > 104 ifTrue: + [lastIndex := startIP + 103]. - lastIndex - startIP > 100 ifTrue: - [lastIndex := startIP + 100]. bytecodesPerLine := 8. startIP to: lastIndex do: [:index| | byte | byte := objectMemory fetchByte: index - 1 ofObject: oop. self cCode: 'printf(" %02x/%-3d", byte,byte)' inSmalltalk: [self space; print: (byte radix: 16); printChar: $/; printNum: byte]. + (index = lastIndex and: [(objectMemory lengthOf: oop) > index]) ifTrue: + [self print: '...']. ((index - startIP + 1) \\ bytecodesPerLine) = 0 ifTrue: [self cr]]. ((lastIndex - startIP + 1) \\ bytecodesPerLine) = 0 ifFalse: [self cr]]! Item was changed: ----- Method: StackInterpreter>>printContext: (in category 'debug printing') ----- printContext: aContext | sender ip sp | <inline: false> self shortPrintContext: aContext. sender := objectMemory fetchPointer: SenderIndex ofObject: aContext. ip := objectMemory fetchPointer: InstructionPointerIndex ofObject: aContext. (objectMemory isIntegerObject: sender) ifTrue: [(self checkIsStillMarriedContext: aContext currentFP: framePointer) ifTrue: [self print: 'married (assuming framePointer valid)'; cr] ifFalse: [self print: 'widdowed (assuming framePointer valid)'; cr]. self print: 'sender '; printNum: sender; print: ' ('; printHexPtr: (self withoutSmallIntegerTags: sender); printChar: $); cr. self print: 'ip '; printNum: ip; print: ' ('; printHexPtr: (self withoutSmallIntegerTags: ip); printChar: $); cr] ifFalse: [self print: 'sender '; shortPrintOop: sender. + self print: 'ip '. + ip = objectMemory nilObject + ifTrue: [self shortPrintOop: ip] + ifFalse: [self printNum: ip; print: ' ('; printNum: (objectMemory integerValueOf: ip); space; printHex: (objectMemory integerValueOf: ip); printChar: $); cr]]. - self print: 'ip '; printNum: ip; print: ' ('; printNum: (objectMemory integerValueOf: ip); space; printHex: (objectMemory integerValueOf: ip); printChar: $); cr]. sp := objectMemory fetchPointer: StackPointerIndex ofObject: aContext. sp := sp min: (objectMemory lengthOf: aContext) - ReceiverIndex. self print: 'sp '; printNum: sp; print: ' ('; printNum: (objectMemory integerValueOf: sp); printChar: $); cr. self print: 'method '; shortPrintOop: (objectMemory fetchPointer: MethodIndex ofObject: aContext). self print: 'closure '; shortPrintOop: (objectMemory fetchPointer: ClosureIndex ofObject: aContext). self print: 'receiver '; shortPrintOop: (objectMemory fetchPointer: ReceiverIndex ofObject: aContext). sp := objectMemory integerValueOf: sp. 1 to: sp do: [:i| self print: ' '; printNum: i; space; shortPrintOop: (objectMemory fetchPointer: ReceiverIndex + i ofObject: aContext)]! Item was changed: ----- Method: StackInterpreter>>shortPrintContext: (in category 'debug printing') ----- shortPrintContext: aContext + | home theFP | - | home | <inline: false> + <var: #theFP type: #'char *'> (self isContext: aContext) ifFalse: [self printHex: aContext; print: ' is not a context'; cr. ^nil]. home := self findHomeForContext: aContext. + self printHex: aContext. - self printNum: aContext. (self isMarriedOrWidowedContext: aContext) + ifTrue: [(self checkIsStillMarriedContext: aContext currentFP: framePointer) + ifTrue: + [(self isMachineCodeFrame: (theFP := self frameOfMarriedContext: aContext)) + ifTrue: [self print: ' M ('] + ifFalse: [self print: ' I (']. + self printHex: theFP; print: ') '] + ifFalse: + [self print: ' w ']] - ifTrue: [((self checkIsStillMarriedContext: aContext currentFP: framePointer) - and: [self isMachineCodeFrame: (self frameOfMarriedContext: aContext)]) - ifTrue: [self print: ' m '] - ifFalse: [self print: ' i ']] ifFalse: [self print: ' s ']. self printActivationNameFor: (objectMemory fetchPointer: MethodIndex ofObject: home) receiver: (objectMemory fetchPointer: ReceiverIndex ofObject: home) isBlock: home ~= aContext firstTemporary: (objectMemory fetchPointer: 0 + CtxtTempFrameStart ofObject: home). self cr! Item was changed: ----- Method: StackInterpreter>>shortPrintFrame: (in category 'debug printing') ----- shortPrintFrame: theFP <inline: false> <var: #theFP type: #'char *'> | rcvr | + (stackPages couldBeFramePointer: theFP) ifFalse: + [self print: 'invalid frame pointer'; cr. - theFP = 0 ifTrue: - [self print: 'null fp'; cr. ^nil]. rcvr := self frameReceiver: theFP. self printHexPtr: theFP. self space. self printActivationNameFor: (self frameMethod: theFP) receiver: rcvr isBlock: (self frameIsBlockActivation: theFP) firstTemporary: (self temporary: 0 in: theFP). self space. self shortPrintOop: rcvr "shortPrintOop: adds a cr"! Item was changed: ----- Method: StackInterpreter>>shortPrintFrame:AndNCallers: (in category 'debug printing') ----- shortPrintFrame: theFP AndNCallers: n <api> <inline: false> <var: #theFP type: #'char *'> + (n ~= 0 and: [stackPages couldBeFramePointer: theFP]) ifTrue: - (n > 0 and: [stackPages couldBeFramePointer: theFP]) ifTrue: [self shortPrintFrame: theFP. self shortPrintFrame: (self frameCallerFP: theFP) AndNCallers: n - 1]! Item was removed: - ----- Method: StackInterpreterSimulator>>printCallStackOf: (in category 'debug printing') ----- - printCallStackOf: aContext - self printCallStackOf: aContext currentFP: localFP! Item was changed: ----- Method: StackToRegisterMappingCogit>>genUpArrowReturn (in category 'bytecode generators') ----- genUpArrowReturn "Generate a method return from within a method or a block. Frameless method activation looks like receiver args sp-> ret pc. Return pops receiver and arguments off the stack. Callee pushes the result." inBlock ifTrue: [self assert: needsFrame. self annotateBytecode: (self CallRT: ceNonLocalReturnTrampoline). ^0]. needsFrame ifTrue: [self MoveR: FPReg R: SPReg. self PopR: FPReg. self RetN: methodOrBlockNumArgs + 1 * BytesPerWord] ifFalse: + [self ssPopSpillsFrom: methodOrBlockNumArgs - 1. + self RetN: ((methodOrBlockNumArgs > self numRegArgs - [self RetN: ((methodOrBlockNumArgs > self numRegArgs "A method with an interpreter prim will push its register args for the prim. If the failure body is frameless the args must still be popped, see e.g. Behavior>>nextInstance." or: [regArgsHaveBeenPushed]) ifTrue: [methodOrBlockNumArgs + 1 * BytesPerWord] ifFalse: [0])]. ^0! Item was added: + ----- Method: StackToRegisterMappingCogit>>isValidFramelessRegister: (in category 'testing') ----- + isValidFramelessRegister: reg + "Answer if the receiver is valid in a frameless method." + ^reg = ReceiverResultReg or: [reg = Arg0Reg]! Item was changed: ----- Method: StackToRegisterMappingCogit>>ssFlushTo: (in category 'simulation stack') ----- ssFlushTo: index methodOrBlockNumTemps to: simSpillBase - 1 do: [:i| self assert: (self simStackAt: i) spilled]. simSpillBase <= index ifTrue: [(simSpillBase max: 0) to: index do: [:i| + self assert: (needsFrame + or: [((self simStackAt: i) type = SSBaseOffset + or: [(self simStackAt: i) type = SSRegister]) + and: [self isValidFramelessRegister: (self simStackAt: i) register]]). - self assert: needsFrame. (self simStackAt: i) ensureSpilledAt: (self frameOffsetOfTemporary: i) from: FPReg]. simSpillBase := index + 1]! Item was added: + ----- Method: StackToRegisterMappingCogit>>ssPopSpillsFrom: (in category 'simulation stack') ----- + ssPopSpillsFrom: index + "Pop any spilled items on the sim stack from index, used to balance the stack on return." + index to: simStackPtr do: + [:i| + (self simStackAt: i) spilled ifTrue: + [self ssTop popToReg: TempReg]]! Item was changed: ----- Method: VMMaker>>logDateAndTime (in category 'UI access') ----- logDateAndTime + | now | + "do it this way since Time now includes milliseconds in some versions." + now := Time dateAndTimeNow. + logger print: now first; space; print: now last; cr; flush! - logger print: Date today; space; print: Time now; cr; flush.!

1 0

VM Maker: Cog-eem.46.mcz
by commits＠source.squeak.org 15 Nov '11

15 Nov '11

Eliot Miranda uploaded a new version of Cog to project VM Maker: http://source.squeak.org/VMMaker/Cog-eem.46.mcz ==================== Summary ==================== Name: Cog-eem.46 Author: eem Time: 15 November 2011, 2:30:13.079 pm UUID: a248b334-3c7b-4bc7-b4a7-2b07f383485c Ancestors: Cog-eem.45 Reduce BochsIA32Alien dataSize now it can be build on WIndows as well as Mac. =============== Diff against Cog-eem.45 =============== Item was changed: ----- Method: BochsIA32Alien class>>dataSize (in category 'instance creation') ----- dataSize + ^18096! - ^19184!

1 0

back to green on cog-mac-cocoa
by Esteban Lorenzano 15 Nov '11

15 Nov '11

Hi, Finally, after couple of days, I have a running version of cog-mac-cocoa build, with latest changes from Eliot integrated. It was hard (and a good learning), and I'm pretty sure I'm making important mistakes (as it is my first big integration), so I don't want to merge with blessed until I'm more or less sure the integration worked. So... this is another "call for test" :) As always, you can download it here: https://ci.lille.inria.fr/pharo/view/Cog/job/Cog-Mac-Cocoa/ cheers, Esteban

3 2

[commit] r2513 - Fix snafu in squeak scripts
by commits＠squeakvm.org 15 Nov '11

15 Nov '11

Author: eliot Date: 2011-11-14 16:39:49 -0800 (Mon, 14 Nov 2011) New Revision: 2513 Modified: branches/Cog/platforms/unix/config/bin.squeak.sh.in branches/Cog/platforms/unix/config/squeak.sh.in Log: Fix snafu in squeak scripts LD_LIBRARY_PATH=$PLUGINS$:{LD_LIBRARY_PATH:-/lib:/usr/lib} exec ... => LD_LIBRARY_PATH=$PLUGINS:${LD_LIBRARY_PATH:-/lib:/usr/lib} exec ... Modified: branches/Cog/platforms/unix/config/bin.squeak.sh.in =================================================================== --- branches/Cog/platforms/unix/config/bin.squeak.sh.in 2011-11-14 18:04:59 UTC (rev 2512) +++ branches/Cog/platforms/unix/config/bin.squeak.sh.in 2011-11-15 00:39:49 UTC (rev 2513) @@ -13,4 +13,4 @@ # prepending is less flexible but safer because it ensures we find the plugins # in the same directory as the VM. We must include at least /lib and /usr/lib # if libraries there-in are to be found. These directories are not implicit. -LD_LIBRARY_PATH=$PLUGINS$:{LD_LIBRARY_PATH:-/lib:/usr/lib} exec "$BIN/squeak" "$@" +LD_LIBRARY_PATH=$PLUGINS:${LD_LIBRARY_PATH:-/lib:/usr/lib} exec "$BIN/squeak" "$@" Modified: branches/Cog/platforms/unix/config/squeak.sh.in =================================================================== --- branches/Cog/platforms/unix/config/squeak.sh.in 2011-11-14 18:04:59 UTC (rev 2512) +++ branches/Cog/platforms/unix/config/squeak.sh.in 2011-11-15 00:39:49 UTC (rev 2513) @@ -13,4 +13,4 @@ # prepending is less flexible but safer because it ensures we find the plugins # in the same directory as the VM. We must include at least /lib and /usr/lib # if libraries there-in are to be found. These directories are not implicit. -LD_LIBRARY_PATH=$PLUGINS$:{LD_LIBRARY_PATH:-/lib:/usr/lib} exec "$BIN/squeak" "$@" +LD_LIBRARY_PATH=$PLUGINS:${LD_LIBRARY_PATH:-/lib:/usr/lib} exec "$BIN/squeak" "$@"

1 0

[commit] r2512 - Eliminate layout differences for BochsIA32Plugin between Mac and Win32.
by commits＠squeakvm.org 14 Nov '11

14 Nov '11

Author: eliot Date: 2011-11-14 10:04:59 -0800 (Mon, 14 Nov 2011) New Revision: 2512 Added: branches/Cog/processors/IA32/winbochs/exploration/ branches/Cog/processors/IA32/winbochs/exploration/Makefile Modified: branches/Cog/cygwinbuild/Makefile.plugin branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj branches/Cog/processors/IA32/bochs/cpu/cpu.h branches/Cog/processors/IA32/bochs/exploration/Makefile branches/Cog/processors/IA32/bochs/fpu/softfloat.h branches/Cog/processors/IA32/macbochs/ branches/Cog/processors/IA32/winbochs/ Log: Eliminate layout differences for BochsIA32Plugin between Mac and Win32. Support building a mingw (-mno-cygwin) c++ dll (and use it for BochsIA32Plugin). Modified: branches/Cog/cygwinbuild/Makefile.plugin =================================================================== --- branches/Cog/cygwinbuild/Makefile.plugin 2011-11-12 21:16:01 UTC (rev 2511) +++ branches/Cog/cygwinbuild/Makefile.plugin 2011-11-14 18:04:59 UTC (rev 2512) @@ -63,7 +63,8 @@ ############################################################################# # DLL settings # -# Note: DLLTOOL/DLLWRAP does the work for everything related to plugins +# Note: By default DLLTOOL/DLLWRAP do the work for everything related to plugins +# but if LINK_WITH_GCC we use gcc and if LINK_WITH_GPP we use g++. # DLLTOOL:= dlltool DLLWRAP:= dllwrap -mno-cygwin @@ -123,6 +124,23 @@ --output-lib $(LIBNAME).lib \ $(DLLTOOLEXTRAS) \ $(LIBOBJ) +ifneq ($(LINK_WITH_GCC),) + gcc -shared \ + -mno-cygwin \ + -def $(LIBNAME).def \ + -o $(VMDIR)/$(LIBNAME).dll \ + --entry _DllMain@12 \ + $(GCCLINKEXTRAS) \ + $(LIBOBJ) $(EXTRALIBS) +else ifneq ($(LINK_WITH_GPP),) + g++ -shared \ + -mno-cygwin \ + -def $(LIBNAME).def \ + -o $(VMDIR)/$(LIBNAME).dll \ + --entry _DllMain@12 \ + $(GPPLINKEXTRAS) \ + $(LIBOBJ) $(EXTRALIBS) +else $(DLLWRAP) -mwindows \ -def $(LIBNAME).def \ -o $(VMDIR)/$(LIBNAME).dll \ @@ -130,6 +148,7 @@ $(DLLWRAPEXTRAS) \ $(LIBNAME).exp \ $(LIBOBJ) $(EXTRALIBS) +endif $(OPTSTRIP) --strip-all $(VMDIR)/$(LIBNAME).dll -$(RM) $(LIBNAME).lib Modified: branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2011-11-12 21:16:01 UTC (rev 2511) +++ branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2011-11-14 18:04:59 UTC (rev 2512) @@ -10,7 +10,7 @@ 73020E8D0EE714E60021D217 /* BochsIA32Plugin.c in Sources */ = {isa = PBXBuildFile; fileRef = 73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */; settings = {COMPILER_FLAGS = "-I../../platforms/Cross/vm -I../../platforms/Cross/plugins/BochsIA32Plugin -I\"../../platforms/Mac OS/vm\" -I../../src/vm"; }; }; 737482B30EE7339F004E10F8 /* libcpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B20EE7339F004E10F8 /* libcpu.a */; }; 737482B50EE733BD004E10F8 /* libfpu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737482B40EE733BD004E10F8 /* libfpu.a */; }; - 737482B70EE7343B004E10F8 /* sqBochsIA32Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */; settings = {COMPILER_FLAGS = "-I../../processors/IA32/bochs -I../../processors/IA32/bochs/instrument/stubs"; }; }; + 737482B70EE7343B004E10F8 /* sqBochsIA32Plugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */; settings = {COMPILER_FLAGS = "-I../../processors/IA32/macbochs -I../../processors/IA32/bochs -I../../processors/IA32/bochs/instrument/stubs"; }; }; 737483080EE7406A004E10F8 /* libdisasm.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 737483070EE7406A004E10F8 /* libdisasm.a */; }; 8D01CCCE0486CAD60068D4B7 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */; }; /* End PBXBuildFile section */ Modified: branches/Cog/processors/IA32/bochs/cpu/cpu.h =================================================================== --- branches/Cog/processors/IA32/bochs/cpu/cpu.h 2011-11-12 21:16:01 UTC (rev 2511) +++ branches/Cog/processors/IA32/bochs/cpu/cpu.h 2011-11-14 18:04:59 UTC (rev 2512) @@ -861,7 +861,11 @@ Bit32u smbase; #if BX_CPU_LEVEL >= 5 +# if COG // msr moved further down to make the member offsets as platform + int unused_filler1[5]; // (don't break existing code) +# else // independent as possible since MSC sizes msr differently to mac. bx_regs_msr_t msr; +# endif #endif #if BX_SUPPORT_FPU || BX_SUPPORT_MMX @@ -905,8 +909,12 @@ volatile bx_bool smi_pending; volatile bx_bool nmi_pending; +#if COG // jmp_buf_env moved further down to make the member offsets as platform + int unused_filler2[18]; // (don't break existing code) +# else // independent as possible since Windows and Mac jmp_buf sizes differ. // for exceptions jmp_buf jmp_buf_env; +#endif Bit8u curr_exception; bx_segment_reg_t save_cs; @@ -943,6 +951,18 @@ #endif Bit8u trace; +#if BX_CPU_LEVEL >= 5 +# if COG + // msr moved to here to make the member offsets as platform independent as + // possible since MSC sizes msr differently to mac. stop_reason above is + // the last field that BochsIA32Alien accesses. + bx_regs_msr_t msr; +# endif +#endif +#if COG // jmp_buf_env moved here to make the member offsets as platform + jmp_buf jmp_buf_env; +#endif // independent as possible since Windows and Mac jmp_buf sizes differ. + // for paging struct { bx_TLB_entry entry[BX_TLB_SIZE] BX_CPP_AlignN(16); Modified: branches/Cog/processors/IA32/bochs/exploration/Makefile =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/Makefile 2011-11-12 21:16:01 UTC (rev 2511) +++ branches/Cog/processors/IA32/bochs/exploration/Makefile 2011-11-14 18:04:59 UTC (rev 2512) @@ -1,8 +1,21 @@ +LIBDEPS=../../bochs/cpu/libcpu.a CFLAGS=-m32 -I.. -I../../bochs -I../../bochs/cpu -I../../bochs/instrument/stubs -L../cpu -lcpu +FULLLIBS=-L../fpu -lfpu -L../disasm -ldisasm -all: printcpu printcpucr printcpuxmm +.PHONY: $(LIBDEPS) + +all: bxcpu.txt BochsIA32Alien-regs.st BochsIA32Alien-cr.st BochsIA32Alien-xmm.st + +bxcpu.txt: printbxcpu + ./printbxcpu >bxcpu.txt + +BochsIA32Alien-regs.st: printcpu ./printcpu >BochsIA32Alien-regs.st + +BochsIA32Alien-cr.st: printcpucr ./printcpucr >BochsIA32Alien-cr.st + +BochsIA32Alien-xmm.st: printcpuxmm ./printcpuxmm >BochsIA32Alien-xmm.st clean: @@ -10,11 +23,14 @@ rm -f printcpu printcpucr printcpuxmm rm -f printcpu.exe printcpucr.exe printcpuxmm.exe -printcpu: printcpu.c - g++ -o $@ printcpu.c $(CFLAGS) +printbxcpu: ../../bochs/exploration/printbxcpu.cpp $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) -printcpucr: printcpucr.c - g++ -o $@ printcpucr.c $(CFLAGS) +printcpu: ../../bochs/exploration/printcpu.c $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) -printcpuxmm: printcpuxmm.c - g++ -o $@ printcpuxmm.c $(CFLAGS) +printcpucr: ../../bochs/exploration/printcpucr.c $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) + +printcpuxmm: ../../bochs/exploration/printcpuxmm.c $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) Modified: branches/Cog/processors/IA32/bochs/fpu/softfloat.h =================================================================== --- branches/Cog/processors/IA32/bochs/fpu/softfloat.h 2011-11-12 21:16:01 UTC (rev 2511) +++ branches/Cog/processors/IA32/bochs/fpu/softfloat.h 2011-11-14 18:04:59 UTC (rev 2512) @@ -256,6 +256,9 @@ | Software IEC/IEEE floating-point types. *----------------------------------------------------------------------------*/ +#if COG /* gcc on Mac packs this into 12 bytes. */ +# pragma pack(push,4) +#endif #ifdef BX_BIG_ENDIAN struct floatx80 { // leave alignment to compiler Bit16u exp; @@ -267,6 +270,9 @@ Bit16u exp; }; #endif +#if COG +# pragma pack(pop) +#endif /*---------------------------------------------------------------------------- | Software IEC/IEEE integer-to-floating-point conversion routines. Property changes on: branches/Cog/processors/IA32/macbochs ___________________________________________________________________ Modified: svn:ignore - Makefile a.out.dSYM bxversion.h bxversion.rc config.h config.log config.status ltdlconf.h bios build bx_debug cpu disasm doc exploration fpu gui host instrument iodev libtool memory misc + Makefile bxversion.h bxversion.rc config.h config.log config.status ltdlconf.h bios build bx_debug cpu disasm doc fpu gui host instrument iodev libtool memory misc Property changes on: branches/Cog/processors/IA32/winbochs ___________________________________________________________________ Modified: svn:ignore - Makefile bxversion.h bxversion.rc config.h config.log config.status ltdlconf.h bios build bx_debug cpu disasm doc exploration fpu gui host instrument iodev libtool memory misc + Makefile bxversion.h bxversion.rc config.h config.log config.status ltdlconf.h bios build bx_debug cpu disasm doc fpu gui host instrument iodev libtool memory misc Property changes on: branches/Cog/processors/IA32/winbochs/exploration ___________________________________________________________________ Added: svn:ignore + *.exe *.st *.txt Added: branches/Cog/processors/IA32/winbochs/exploration/Makefile =================================================================== --- branches/Cog/processors/IA32/winbochs/exploration/Makefile (rev 0) +++ branches/Cog/processors/IA32/winbochs/exploration/Makefile 2011-11-14 18:04:59 UTC (rev 2512) @@ -0,0 +1,36 @@ +LIBDEPS=../../bochs/cpu/libcpu.a +CFLAGS=-m32 -I.. -I../../bochs -I../../bochs/cpu -I../../bochs/instrument/stubs -L../cpu -lcpu +FULLLIBS=-L../fpu -lfpu -L../disasm -ldisasm + +.PHONY: $(LIBDEPS) + +all: bxcpu.txt BochsIA32Alien-regs.st BochsIA32Alien-cr.st BochsIA32Alien-xmm.st + +bxcpu.txt: printbxcpu + ./printbxcpu >bxcpu.txt + +BochsIA32Alien-regs.st: printcpu + ./printcpu >BochsIA32Alien-regs.st + +BochsIA32Alien-cr.st: printcpucr + ./printcpucr >BochsIA32Alien-cr.st + +BochsIA32Alien-xmm.st: printcpuxmm + ./printcpuxmm >BochsIA32Alien-xmm.st + +clean: + rm -f BochsIA32Alien-regs.st BochsIA32Alien-cr.st BochsIA32Alien-xmm.st + rm -f printcpu printcpucr printcpuxmm + rm -f printcpu.exe printcpucr.exe printcpuxmm.exe + +printbxcpu: ../../bochs/exploration/printbxcpu.cpp $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) + +printcpu: ../../bochs/exploration/printcpu.c $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) + +printcpucr: ../../bochs/exploration/printcpucr.c $(LIBDEPS) + g++ -o $@ $< $(CFLAGS) + +printcpuxmm: ../../bochs/exploration/printcpuxmm.c $(LIBDEPS) + g++ -o $@ $< $(CFLAGS)

1 0

Intermittent crashes
by Sean P. DeNigris 12 Nov '11

12 Nov '11

My image is crashing intermittently with no crash.dmp or debug log. It is Pharo 1.3-rc with the Jenkins Mac Carbon Jit VM. The crashes may be related to OSProcess, but I'm having trouble reproducing it consistently. I just wanted to give a heads-up. Sean -- View this message in context: http://forum.world.st/Intermittent-crashes-tp3997379p3997379.html Sent from the Squeak VM mailing list archive at Nabble.com.

2 8

[commit] r2511 - Add suitable ignore properties to the bochs per-platform build dirs.
by commits＠squeakvm.org 12 Nov '11

12 Nov '11

Author: eliot Date: 2011-11-12 13:16:01 -0800 (Sat, 12 Nov 2011) New Revision: 2511 Modified: branches/Cog/processors/IA32/linuxbochs/ branches/Cog/processors/IA32/macbochs/ branches/Cog/processors/IA32/winbochs/ Log: Add suitable ignore properties to the bochs per-platform build dirs. Property changes on: branches/Cog/processors/IA32/linuxbochs ___________________________________________________________________ Added: svn:ignore + Makefile bxversion.h bxversion.rc config.h config.log config.status ltdlconf.h bios build bx_debug cpu disasm doc exploration fpu gui host instrument iodev libtool memory misc Property changes on: branches/Cog/processors/IA32/macbochs ___________________________________________________________________ Added: svn:ignore + Makefile a.out.dSYM bxversion.h bxversion.rc config.h config.log config.status ltdlconf.h bios build bx_debug cpu disasm doc exploration fpu gui host instrument iodev libtool memory misc Property changes on: branches/Cog/processors/IA32/winbochs ___________________________________________________________________ Added: svn:ignore + Makefile bxversion.h bxversion.rc config.h config.log config.status ltdlconf.h bios build bx_debug cpu disasm doc exploration fpu gui host instrument iodev libtool memory misc

1 0

[commit] r2510 - Add separate build directories to bochs library to enable building
by commits＠squeakvm.org 12 Nov '11

12 Nov '11

Author: eliot Date: 2011-11-12 13:10:06 -0800 (Sat, 12 Nov 2011) New Revision: 2510 Added: branches/Cog/processors/IA32/bochs/README.COG branches/Cog/processors/IA32/bochs/exploration/Makefile branches/Cog/processors/IA32/linuxbochs/ branches/Cog/processors/IA32/linuxbochs/conf.COG branches/Cog/processors/IA32/macbochs/ branches/Cog/processors/IA32/macbochs/conf.COG branches/Cog/processors/IA32/winbochs/ branches/Cog/processors/IA32/winbochs/conf.COG Removed: branches/Cog/processors/IA32/bochs/conf.COG branches/Cog/processors/IA32/bochs/config.h Modified: branches/Cog/cygwinbuild/plugins.ext branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj branches/Cog/processors/IA32/bochs/exploration/printcpu.c branches/Cog/processors/IA32/bochs/exploration/printcpucr.c branches/Cog/processors/IA32/bochs/exploration/printcpuxmm.c Log: Add separate build directories to bochs library to enable building BochsIA32Plugin on multiple platforms. Add external BochsIA32Plugin on win32. Modified: branches/Cog/cygwinbuild/plugins.ext =================================================================== --- branches/Cog/cygwinbuild/plugins.ext 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/cygwinbuild/plugins.ext 2011-11-12 21:10:06 UTC (rev 2510) @@ -1,5 +1,6 @@ # List of external plugins. EXTERNAL_PLUGINS = \ +BochsIA32Plugin \ SqueakFFIPrims \ Win32OSProcessPlugin Modified: branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj =================================================================== --- branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/macbuild/BochsIA32Plugin/BochsIA32Plugin.xcodeproj/project.pbxproj 2011-11-12 21:10:06 UTC (rev 2510) @@ -19,10 +19,10 @@ 08EA7FFBFE8413EDC02AAC07 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; }; 73020E8C0EE714E60021D217 /* BochsIA32Plugin.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = BochsIA32Plugin.c; path = ../../src/plugins/BochsIA32Plugin/BochsIA32Plugin.c; sourceTree = SOURCE_ROOT; }; 73020E8E0EE7158C0021D217 /* BochsIA32Plugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BochsIA32Plugin.h; path = ../../platforms/Cross/plugins/BochsIA32Plugin/BochsIA32Plugin.h; sourceTree = SOURCE_ROOT; }; - 737482B20EE7339F004E10F8 /* libcpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcpu.a; path = ../../processors/IA32/bochs/cpu/libcpu.a; sourceTree = SOURCE_ROOT; }; - 737482B40EE733BD004E10F8 /* libfpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfpu.a; path = ../../processors/IA32/bochs/fpu/libfpu.a; sourceTree = SOURCE_ROOT; }; + 737482B20EE7339F004E10F8 /* libcpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libcpu.a; path = ../../processors/IA32/macbochs/cpu/libcpu.a; sourceTree = SOURCE_ROOT; }; + 737482B40EE733BD004E10F8 /* libfpu.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libfpu.a; path = ../../processors/IA32/macbochs/fpu/libfpu.a; sourceTree = SOURCE_ROOT; }; 737482B60EE7343B004E10F8 /* sqBochsIA32Plugin.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = sqBochsIA32Plugin.cpp; path = ../../platforms/Cross/plugins/BochsIA32Plugin/sqBochsIA32Plugin.cpp; sourceTree = SOURCE_ROOT; }; - 737483070EE7406A004E10F8 /* libdisasm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdisasm.a; path = ../../processors/IA32/bochs/disasm/libdisasm.a; sourceTree = SOURCE_ROOT; }; + 737483070EE7406A004E10F8 /* libdisasm.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdisasm.a; path = ../../processors/IA32/macbochs/disasm/libdisasm.a; sourceTree = SOURCE_ROOT; }; 8D01CCD10486CAD60068D4B7 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; }; 8D01CCD20486CAD60068D4B7 /* BochsIA32Plugin.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = BochsIA32Plugin.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; DA3A20F50AA63CBF0050B983 /* interp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = interp.h; path = ../../src/vm/interp.h; sourceTree = SOURCE_ROOT; }; @@ -178,14 +178,10 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../processors/IA32/bochs/cpu\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../processors/IA32/bochs/fpu\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../processors/IA32/bochs/disasm\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../processors/IA32/bochs/gui\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../processors/IA32/bochs/gui\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../processors/IA32/macbochs/cpu\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../processors/IA32/macbochs/fpu\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../processors/IA32/macbochs/disasm\""; PRODUCT_NAME = BochsIA32Plugin; WRAPPER_EXTENSION = bundle; ZERO_LINK = YES; @@ -205,14 +201,10 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5)", ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../processors/IA32/bochs/cpu\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../processors/IA32/bochs/fpu\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../processors/IA32/bochs/disasm\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_4 = "\"$(SRCROOT)/../../processors/IA32/bochs/gui\""; - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_5 = "\"$(SRCROOT)/../../processors/IA32/bochs/gui\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/../../processors/IA32/macbochs/cpu\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_2 = "\"$(SRCROOT)/../../processors/IA32/macbochs/fpu\""; + LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_3 = "\"$(SRCROOT)/../../processors/IA32/macbochs/disasm\""; PRODUCT_NAME = BochsIA32Plugin; WRAPPER_EXTENSION = bundle; }; Added: branches/Cog/processors/IA32/bochs/README.COG =================================================================== --- branches/Cog/processors/IA32/bochs/README.COG (rev 0) +++ branches/Cog/processors/IA32/bochs/README.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,3 @@ +Guide to build Bochs support librarires libcpu.a libfpu.a & libdisasm.a for Cog. +Go to the sibling directory for your platform (../macbochs, ../winbochs etc) +and read and then run conf.COG there-in. Then run ../bochs/makeem there-in. Deleted: branches/Cog/processors/IA32/bochs/conf.COG =================================================================== --- branches/Cog/processors/IA32/bochs/conf.COG 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/conf.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -1,48 +0,0 @@ -#!/bin/sh - -# this sets up the compile for Cog. Disable as much inessential stuff -# as possible leaving only the cpu/fpu & memory interface - -# build using -# $ ./conf.COG -# $ ./makeem - -set echo -# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" -CFLAGS="-m32 $CFLAGS" -CFLAGS="-Dlongjmp=_longjmp -Dsetjmp=_setjmp $CFLAGS" -CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" -CFLAGS="-g $CFLAGS" -CPPFLAGS="" -CXXFLAGS="$CFLAGS" - -export CFLAGS -export CPATH -export CPPFLAGS -export CXXFLAGS -export LDFLAGS - -./configure --enable-Cog \ - --enable-cpu-level=6 \ - --enable-sse=2 \ - --enable-assert-checks \ - --with-nogui \ - --disable-x86-64 \ - --disable-pae \ - --disable-large-pages \ - --disable-global-pages \ - --disable-mtrr \ - --disable-sb16 \ - --disable-ne2000 \ - --disable-pci \ - --disable-acpi \ - --disable-apic \ - --disable-clgd54xx \ - --disable-usb \ - --disable-plugins \ - ${CONFIGURE_ARGS} - -# apic == Advanced programmable Interrupt Controller -# acpi == Advanced Configuration and Power Interface -# pci == Peripheral Component Interconnect local bus -# clgd54xx == Cirrus Logic GD54xx video card Deleted: branches/Cog/processors/IA32/bochs/config.h =================================================================== --- branches/Cog/processors/IA32/bochs/config.h 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/config.h 2011-11-12 21:10:06 UTC (rev 2510) @@ -1,979 +0,0 @@ -/* config.h. Generated from config.h.in by configure. */ -// Copyright (C) 2001 MandrakeSoft S.A. -// -// MandrakeSoft S.A. -// 43, rue d'Aboukir -// 75002 Paris - France -// http://www.linux-mandrake.com/ -// http://www.mandrakesoft.com/ -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Lesser General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public -// License along with this library; if not, write to the Free Software -// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - -// -// config.h.in is distributed in the source TAR file. When you run -// the configure script, it generates config.h with some changes -// according to your build environment. For example, in config.h.in, -// SIZEOF_UNSIGNED_CHAR is set to 0. When configure produces config.h -// it will change "0" to the detected value for your system. -// -// config.h contains ONLY preprocessor #defines and a few typedefs. -// It must be included by both C and C++ files, so it must not -// contain anything language dependent such as a class declaration. -// - -#ifndef _BX_CONFIG_H_ -#define _BX_CONFIG_H_ 1 - -/////////////////////////////////////////////////////////////////// -// USER CONFIGURABLE OPTIONS : EDIT ONLY OPTIONS IN THIS SECTION // -/////////////////////////////////////////////////////////////////// - - -#if 1 -// quit_sim is defined in gui/siminterface.h -#define BX_EXIT(x) SIM->quit_sim (x) -#else -// provide the real main and the usual exit. -#define BX_EXIT(x) ::exit(x) -#endif - -// We have tested the following combinations: -// * processors=1, bootstrap=0, ioapic_id=1 (uniprocessor system) -// * processors=2, bootstrap=0, ioapic_id=2 -// * processors=4, bootstrap=0, ioapic_id=4 -#define BX_SUPPORT_SMP 0 -#define BX_BOOTSTRAP_PROCESSOR 0 -#define BX_MAX_SMP_THREADS_SUPPORTED 8 - -// include in APIC models, required for a multiprocessor system. -#define BX_SUPPORT_APIC 0 - -#if (BX_SUPPORT_SMP && !BX_SUPPORT_APIC) -#error For multiprocessor simulation, BX_SUPPORT_APIC is required. -#endif - -// if simulating Linux, this provides a few more debugging options -// such as tracing all system calls. -#define BX_DEBUG_LINUX 0 - -// adds support for the GNU readline library in the debugger command -// prompt. -#define HAVE_LIBREADLINE 0 -#define HAVE_READLINE_HISTORY_H 1 - -// Define to 1 if you have <locale.h> -#define HAVE_LOCALE_H 0 - -// I rebuilt the code which provides timers to IO devices. -// Setting this to 1 will introduce a little code which -// will panic out if cases which shouldn't happen occur. -// Set this to 0 for optimal performance. -#define BX_TIMER_DEBUG 0 - -// Settable A20 line. For efficiency, you can disable -// having a settable A20 line, eliminating conditional -// code for every physical memory access. You'll have -// to tell your software not to mess with the A20 line, -// and accept it as always being on if you change this. -// 1 = use settable A20 line. (normal) -// 0 = A20 is like the rest of the address lines - -#define BX_SUPPORT_A20 1 - -// Processor Instructions Per Second -// To find out what value to use for the 'ips' directive -// in your '.bochsrc' file, set BX_SHOW_IPS to 1, and -// run the software in bochs you plan to use most. Bochs -// will print out periodic IPS ratings. This will change -// based on the processor mode at the time, and various -// other factors. You'll get a reasonable estimate though. -// When you're done, reset BX_SHOW_IPS to 0, do a -// 'make all-clean', then 'make' again. - -#define BX_SHOW_IPS 0 - - -#if (BX_SHOW_IPS) && (defined(__MINGW32__) || defined(_MSC_VER)) -#define SIGALRM 14 -#endif - -// Compile in support for DMA & FLOPPY IO. You'll need this -// if you plan to use the floppy drive emulation. But if -// you're environment doesn't require it, you can change -// it to 0. - -#define BX_DMA_FLOPPY_IO 1 - -// Default number of Megs of memory to emulate. The -// 'megs:' directive in the '.bochsrc' file overrides this, -// allowing per-run settings. - -#define BX_DEFAULT_MEM_MEGS 32 - -// CPU level emulation. Default level is set in -// the configure script. BX_CPU_LEVEL defines the CPU level -// to emulate. BX_CPU_LEVEL_HACKED is a hack to define the -// level of some instructions, so they can be tested before -// the rest of the emulation is up to that level. - -#define BX_CPU_LEVEL 6 -#define BX_CPU_LEVEL_HACKED 6 - -// emulate x86-64 instruction set? -#define BX_SUPPORT_X86_64 0 - -// emulate long physical address (>32 bit) -#define BX_PHY_ADDRESS_LONG 0 - -#define BX_HAVE_SLEEP 1 -#define BX_HAVE_MSLEEP 0 -#define BX_HAVE_USLEEP 1 -#define BX_HAVE_NANOSLEEP 1 -#define BX_HAVE_ABORT 1 -#define BX_HAVE_SOCKLEN_T 1 -#define BX_HAVE_SOCKADDR_IN_SIN_LEN 1 -#define BX_HAVE_GETTIMEOFDAY 1 -#if defined(WIN32) -#define BX_HAVE_REALTIME_USEC 1 -#else -#define BX_HAVE_REALTIME_USEC (BX_HAVE_GETTIMEOFDAY) -#endif -#define BX_HAVE_MKSTEMP 1 -#define BX_HAVE_SYS_MMAN_H 1 -#define BX_HAVE_XPM_H 0 -#define BX_HAVE_TIMELOCAL 1 -#define BX_HAVE_GMTIME 1 -#define BX_HAVE_MKTIME 1 -#define BX_HAVE_NET_IF_H 0 - -// This turns on Roland Mainz's idle hack. Presently it is specific to the X11 -// and term gui. If people try to enable it elsewhere, give a compile error -// after the gui definition so that they don't waste their time trying. -#define BX_USE_IDLE_HACK 0 - -// Minimum Emulated IPS. -// This is used in the realtime PIT as well as for checking the -// IPS value set in the config file. -#define BX_MIN_IPS 200000 - -// Minimum and maximum values for SMP quantum variable. Defines -// how many instructions each CPU could execute execute in one -// shot (one cpu_loop call) -#define BX_SMP_QUANTUM_MIN 1 -#define BX_SMP_QUANTUM_MAX 16 - -// Use Static Member Funtions to eliminate 'this' pointer passing -// If you want the efficiency of 'C', you can make all the -// members of the C++ CPU class to be static. -// This defaults to 1 since it should improve performance, but when -// SMP mode is enabled, it will be turned off by configure. -#define BX_USE_CPU_SMF 1 - -#define BX_USE_MEM_SMF 1 - -// Use static member functions in IO DEVice emulation modules. -// For efficiency, use C like functions for IO handling, -// and declare a device instance at compile time, -// instead of using 'new' and storing the pointer. This -// eliminates some overhead, especially for high-use IO -// devices like the disk drive. -// 1 = Use static member efficiency (normal) -// 0 = Use nonstatic member functions (use only if you need -// multiple instances of a device class - -#define BX_USE_HD_SMF 1 // Hard drive -#define BX_USE_BIOS_SMF 1 // BIOS -#define BX_USE_CMOS_SMF 1 // CMOS -#define BX_USE_DMA_SMF 1 // DMA -#define BX_USE_FD_SMF 1 // Floppy -#define BX_USE_KEY_SMF 1 // Keyboard -#define BX_USE_PAR_SMF 1 // Parallel -#define BX_USE_PIC_SMF 1 // PIC -#define BX_USE_PIT_SMF 1 // PIT -#define BX_USE_SER_SMF 1 // Serial -#define BX_USE_UM_SMF 1 // Unmapped -#define BX_USE_VGA_SMF 1 // VGA -#define BX_USE_SB16_SMF 1 // Sound (SB 16) -#define BX_USE_DEV_SMF 1 // System Devices (port92) -#define BX_USE_PCI_SMF 1 // PCI -#define BX_USE_P2I_SMF 1 // PCI-to-ISA bridge -#define BX_USE_PIDE_SMF 1 // PCI-IDE -#define BX_USE_PCIVGA_SMF 1 // PCI-VGA -#define BX_USE_PCIDEV_SMF 1 // PCI-DEV -#define BX_USE_PCIUSB_SMF 1 // USB hub -#define BX_USE_PCIPNIC_SMF 1 // PCI pseudo NIC -#define BX_USE_NE2K_SMF 1 // NE2K -#define BX_USE_EFI_SMF 1 // External FPU IRQ -#define BX_USE_GAMEPORT_SMF 1 // Gameport -#define BX_USE_CIRRUS_SMF 1 // SVGA Cirrus -#define BX_USE_BUSM_SMF 1 // Bus Mouse -#define BX_USE_ACPI_SMF 1 // ACPI - -#define BX_PLUGINS 0 -#define BX_HAVE_DLFCN_H 1 - -#if BX_PLUGINS && \ - ( !BX_USE_HD_SMF || !BX_USE_BIOS_SMF || !BX_USE_CMOS_SMF \ - || !BX_USE_DMA_SMF || !BX_USE_FD_SMF || !BX_USE_KEY_SMF \ - || !BX_USE_PAR_SMF || !BX_USE_PIC_SMF || !BX_USE_PIT_SMF \ - || !BX_USE_SER_SMF || !BX_USE_UM_SMF || !BX_USE_VGA_SMF \ - || !BX_USE_SB16_SMF || !BX_USE_DEV_SMF || !BX_USE_PCI_SMF \ - || !BX_USE_P2I_SMF || !BX_USE_PCIVGA_SMF || !BX_USE_PCIUSB_SMF \ - || !BX_USE_PCIPNIC_SMF || !BX_USE_PIDE_SMF || !BX_USE_ACPI_SMF \ - || !BX_USE_NE2K_SMF || !BX_USE_EFI_SMF || !BX_USE_GAMEPORT_SMF \ - || !BX_USE_PCIDEV_SMF || !BX_USE_CIRRUS_SMF) -#error You must use SMF to have plugins -#endif - -#define BX_SUPPORT_SB16 0 -#define BX_SUPPORT_GAMEPORT 0 - -#if BX_SUPPORT_SB16 -// Use virtual methods for the sound output functions -#define BX_USE_SOUND_VIRTUAL 1 -// Determines which sound output class is to be used. -// Currently the following are available: -// bx_sound_linux_c Output for Linux, to /dev/dsp and /dev/midi00 -// bx_sound_windows_c Output for Windows midi and wave mappers -// bx_sound_output_c Dummy functions, no output -#define BX_SOUND_OUTPUT_C bx_sound_output_c -// Use ALSA sound interface on Linux -#define BX_HAVE_ALSASOUND 0 -#endif - -#define USE_RAW_SERIAL 0 - -// This enables writing to port 0xe9 and the output -// is sent to the console. Reading from port 0xe9 -// will return 0xe9 to let you know this is available. -// Leave this 0 unless you have a reason to use it. -#define BX_PORT_E9_HACK 1 - -#define BX_GDBSTUB 0 - -// This option enables compressed (zlib) hd support -#define BX_COMPRESSED_HD_SUPPORT 0 -#define BX_HAVE_ZLIB 1 - -#if BX_COMPRESSED_HD_SUPPORT && !BX_HAVE_ZLIB -#error You must have zlib to enable compressed hd support -#endif - -// This option defines the number of supported ATA channels. -// There are up to two drives per ATA channel. -#define BX_MAX_ATA_CHANNEL 4 - -#if (BX_MAX_ATA_CHANNEL>4 || BX_MAX_ATA_CHANNEL<1) -# error "BX_MAX_ATA_CHANNEL should be between 1 and 4" -#endif - -// ================================================================= -// BEGIN: OPTIONAL DEBUGGER SECTION -// -// These options are only used if you compile in support for the -// native command line debugging environment. Typically, the debugger -// is not used, and this section can be ignored. -// ================================================================= - -// Compile in support for virtual/linear/physical breakpoints. -// Enable only those you need. Recommend using only linear -// breakpoints, unless you need others. Less supported means -// slightly faster execution time. -#define BX_DBG_MAX_VIR_BPOINTS 16 -#define BX_DBG_MAX_LIN_BPOINTS 16 -#define BX_DBG_MAX_PHY_BPOINTS 16 - -#define BX_DBG_MAX_WATCHPONTS 16 - -// max file pathname size for debugger commands -#define BX_MAX_PATH 256 -// max nesting level for debug scripts including other scripts -#define BX_INFILE_DEPTH 10 -// use this command to include (nest) debug scripts -#define BX_INCLUDE_CMD "source" - -// Make a call to command line debugger extensions. If set to 1, -// a call is made. An external routine has a chance to process -// the command. If it does, than the debugger ignores the command. -#define BX_DBG_EXTENSIONS 0 - -// ================================================================= -// END: OPTIONAL DEBUGGER SECTION -// ================================================================= - -////////////////////////////////////////////////////////////////////// -// END OF USER CONFIGURABLE OPTIONS : DON'T EDIT ANYTHING BELOW !!! // -// THIS IS GENERATED BY THE ./configure SCRIPT // -////////////////////////////////////////////////////////////////////// - - -#define BX_WITH_X11 0 -#define BX_WITH_BEOS 0 -#define BX_WITH_WIN32 0 -#define BX_WITH_MACOS 0 -#define BX_WITH_CARBON 0 -#define BX_WITH_NOGUI 1 -#define BX_WITH_TERM 0 -#define BX_WITH_RFB 0 -#define BX_WITH_AMIGAOS 0 -#define BX_WITH_SDL 0 -#define BX_WITH_SVGA 0 -#define BX_WITH_WX 0 - -// BX_USE_TEXTCONFIG should be set to 1 unless Bochs is compiled -// for wxWidgets only. -#define BX_USE_TEXTCONFIG 1 - -// A certain functions must NOT be fastcall even if compiled with fastcall -// option, and those are callbacks from Windows which are defined either -// as cdecl or stdcall. The entry point main() also has to remain cdecl. -#ifndef CDECL -#if defined(_MSC_VER) - #define CDECL __cdecl -#else - #define CDECL -#endif -#endif - -// add special export symbols for win32 DLL building. The main code must -// have __declspec(dllexport) on variables, functions, or classes that the -// plugins can access. The plugins should #define PLUGGABLE which will -// activate the __declspec(dllimport) instead. -#if defined(WIN32) || defined(__CYGWIN__) -# if BX_PLUGINS && defined(BX_PLUGGABLE) -// #warning I will import DLL symbols from Bochs main program. -# define BOCHSAPI __declspec(dllimport) -# elif BX_PLUGINS -// #warning I will export DLL symbols. -# define BOCHSAPI __declspec(dllexport) -# endif -#endif -#ifndef BOCHSAPI -# define BOCHSAPI -#endif - -#if defined(__CYGWIN__) -// Make BOCHSAPI_CYGONLY exactly the same as BOCHSAPI. This symbol -// will be used for any cases where Cygwin requires a special tag -// but VC++ does not. -#define BOCHSAPI_CYGONLY BOCHSAPI -#else -// define the symbol to be empty -#define BOCHSAPI_CYGONLY /*empty*/ -#endif - -#if defined(_MSC_VER) -// Make BOCHSAPI_MSVCONLY exactly the same as BOCHSAPI. This symbol -// will be used for any cases where VC++ requires a special tag -// but Cygwin does not. -#define BOCHSAPI_MSVCONLY BOCHSAPI -#else -// define the symbol to be empty -#define BOCHSAPI_MSVCONLY /*empty*/ -#endif - -#define BX_DEFAULT_CONFIG_INTERFACE "defined_by_configure" -#define BX_DEFAULT_DISPLAY_LIBRARY "defined_by_configure" - -// Roland Mainz's idle hack is presently specific to X11. If people try to -// enable it elsewhere, give a compile error so that they don't waste their -// time trying. -#if (BX_USE_IDLE_HACK && !BX_WITH_X11 && !BX_WITH_TERM) -# error IDLE_HACK will only work with the X11 or term gui. Correct configure args and retry. -#endif - -#define WORDS_BIGENDIAN 0 - -#define SIZEOF_UNSIGNED_CHAR 1 -#define SIZEOF_UNSIGNED_SHORT 2 -#define SIZEOF_UNSIGNED_INT 4 -#define SIZEOF_UNSIGNED_LONG 4 -#define SIZEOF_UNSIGNED_LONG_LONG 8 -#define SIZEOF_INT_P 4 - -#define BX_64BIT_CONSTANTS_USE_LL 1 -#if BX_64BIT_CONSTANTS_USE_LL -// doesn't work on Microsoft Visual C++, maybe others -#define BX_CONST64(x) (x##LL) -#elif defined(_MSC_VER) -#define BX_CONST64(x) (x##I64) -#else -#define BX_CONST64(x) (x) -#endif - -#if defined(WIN32) - typedef unsigned char Bit8u; - typedef signed char Bit8s; - typedef unsigned short Bit16u; - typedef signed short Bit16s; - typedef unsigned int Bit32u; - typedef signed int Bit32s; -#ifdef __MINGW32__ - typedef unsigned long long Bit64u; - typedef signed long long Bit64s; -#include <sys/types.h> -#else - typedef unsigned __int64 Bit64u; - typedef signed __int64 Bit64s; -#endif -#elif BX_WITH_MACOS - typedef unsigned char Bit8u; - typedef signed char Bit8s; - typedef unsigned short Bit16u; - typedef signed short Bit16s; - typedef unsigned int Bit32u; - typedef signed int Bit32s; - typedef unsigned long long Bit64u; - typedef signed long long Bit64s; -#else - -// Unix like platforms - -#if SIZEOF_UNSIGNED_CHAR != 1 -# error "sizeof (unsigned char) != 1" -#else - typedef unsigned char Bit8u; - typedef signed char Bit8s; -#endif - -#if SIZEOF_UNSIGNED_SHORT != 2 -# error "sizeof (unsigned short) != 2" -#else - typedef unsigned short Bit16u; - typedef signed short Bit16s; -#endif - -#if SIZEOF_UNSIGNED_INT == 4 - typedef unsigned int Bit32u; - typedef signed int Bit32s; -#elif SIZEOF_UNSIGNED_LONG == 4 - typedef unsigned long Bit32u; - typedef signed long Bit32s; -#else -# error "can't find sizeof(type) of 4 bytes!" -#endif - -#if SIZEOF_UNSIGNED_LONG == 8 - typedef unsigned long Bit64u; - typedef signed long Bit64s; -#elif SIZEOF_UNSIGNED_LONG_LONG == 8 - typedef unsigned long long Bit64u; - typedef signed long long Bit64s; -#else -# error "can't find data type of 8 bytes" -#endif - -#endif - -#define GET32L(val64) ((Bit32u)(((Bit64u)(val64)) & 0xFFFFFFFF)) -#define GET32H(val64) ((Bit32u)(((Bit64u)(val64)) >> 32)) - -// now that Bit32u and Bit64u exist, defined bx_address -#if BX_SUPPORT_X86_64 -typedef Bit64u bx_address; -#else -typedef Bit32u bx_address; -#endif - -// define physical and linear address types -typedef bx_address bx_lin_address; - -#if BX_SUPPORT_X86_64 -#define BX_LIN_ADDRESS_WIDTH 48 -#else -#define BX_LIN_ADDRESS_WIDTH 32 -#endif - -#if BX_PHY_ADDRESS_LONG -typedef Bit64u bx_phy_address; -#define BX_PHY_ADDRESS_WIDTH 40 -#else -typedef Bit32u bx_phy_address; -#define BX_PHY_ADDRESS_WIDTH 32 -#endif - -// technically, in an 8 bit signed the real minimum is -128, not -127. -// But if you decide to negate -128 you tend to get -128 again, so it's -// better not to use the absolute maximum in the signed range. -#define BX_MAX_BIT64U ( (Bit64u) -1 ) -#define BX_MIN_BIT64U ( 0 ) -#define BX_MAX_BIT64S ( ((Bit64u) -1) >> 1 ) -#define BX_MIN_BIT64S ( (Bit64s)-(((Bit64u) -1) >> 1) ) -#define BX_MAX_BIT32U ( (Bit32u) -1 ) -#define BX_MIN_BIT32U ( 0 ) -#define BX_MAX_BIT32S ( ((Bit32u) -1) >> 1 ) -#define BX_MIN_BIT32S ( (Bit32s)-(((Bit32u) -1) >> 1) ) -#define BX_MAX_BIT16U ( (Bit16u) -1 ) -#define BX_MIN_BIT16U ( 0 ) -#define BX_MAX_BIT16S ( ((Bit16u) -1) >> 1 ) -#define BX_MIN_BIT16S ( (Bit16s)-(((Bit16u) -1) >> 1) ) -#define BX_MAX_BIT8U ( (Bit8u) -1 ) -#define BX_MIN_BIT8U ( 0 ) -#define BX_MAX_BIT8S ( ((Bit8u) -1) >> 1 ) -#define BX_MIN_BIT8S ( (Bit8s)-(((Bit8u) -1) >> 1) ) - - -// create an unsigned integer type that is the same size as a pointer. -// You can typecast a pointer to a bx_pr_equiv_t without losing any -// bits (and without getting the compiler excited). This is used in -// the FPU emulation code, where pointers and integers are often -// used interchangeably. -#if SIZEOF_INT_P == 4 - typedef Bit32u bx_ptr_equiv_t; -#elif SIZEOF_INT_P == 8 - typedef Bit64u bx_ptr_equiv_t; -#else -# error "could not define bx_ptr_equiv_t to size of int*" -#endif - -// Use a boolean type that will not conflict with the builtin type -// on any system. -typedef Bit32u bx_bool; - -#if BX_WITH_MACOS -# define bx_ptr_t char * -#else -# define bx_ptr_t void * -#endif - -#if defined(WIN32) -# define BX_LITTLE_ENDIAN -#elif BX_WITH_MACOS -# define BX_BIG_ENDIAN -#else -#if WORDS_BIGENDIAN -# define BX_BIG_ENDIAN -#else -# define BX_LITTLE_ENDIAN -#endif -#endif // defined(WIN32) - - -#if BX_SUPPORT_X86_64 -#ifdef BX_LITTLE_ENDIAN -typedef - struct { - Bit64u lo; - Bit64u hi; - } Bit128u; -typedef - struct { - Bit64u lo; - Bit64s hi; - } Bit128s; -#else // must be Big Endian -typedef - struct { - Bit64u hi; - Bit64u lo; - } Bit128u; -typedef - struct { - Bit64s hi; - Bit64u lo; - } Bit128s; -#endif -#endif // #if BX_SUPPORT_X86_64 - - -// for now only term.cc requires a GUI sighandler. -#define BX_GUI_SIGHANDLER (BX_WITH_TERM) - -#define HAVE_SIGACTION 1 - -// configure will change the definition of "inline" to the value -// that the C compiler allows. It tests the following keywords to -// see if any is permitted: inline, __inline__, __inline. If none -// is permitted, it defines inline to be empty. -#define inline inline - -// inline functions in headers that are compiled with C compiler -// (e.g. fpu code) are declared with BX_C_INLINE macro. Note that -// the word "inline" itself may now be redefined by the above #define. -// Many compilers are known to work with "static inline". If the -// compiler can put the function inline, it does so and never creates -// a symbol for the function. If optimization is off, or inline is -// defined to be empty, the static keyword causes the function to create -// a symbol that's visible only to that .c file. Each .c file that -// includes the header will produce another local version of the -// BX_C_INLINE function (not ideal). However without "static" you can -// duplicate symbol problems which are even worse. -#define BX_C_INLINE static inline - -// Use BX_CPP_INLINE for all C++ inline functions. Note that the -// word "inline" itself may now be redefined by the above #define. -#define BX_CPP_INLINE inline - -#ifdef __GNUC__ - -// Some helpful compiler hints for compilers that allow them; GCC for now. -// -// BX_CPP_AlignN(n): -// Align a construct on an n-byte boundary. -// -// BX_CPP_AttrPrintf(formatArg, firstArg): -// This function takes printf-like arguments, so the compiler can check -// the consistency of the format string and the matching arguments. -// 'formatArg' is the parameter number (starting from 1) of the format -// string argument. 'firstArg' is the parameter number of the 1st argument -// to check against the string argument. NOTE: For non-static member -// functions, the this-ptr is argument number 1 but is invisible on -// the function prototype declaration - but you still have to count it. -// -// BX_CPP_AttrNoReturn(): -// This function never returns. The compiler can optimize-out following -// code accordingly. - -#define BX_CPP_AlignN(n) __attribute__ ((aligned (n))) -#define BX_CPP_AttrPrintf(formatArg, firstArg) \ - __attribute__ ((format (printf, formatArg, firstArg))) -#define BX_CPP_AttrNoReturn() __attribute__ ((noreturn)) - -#else - -#define BX_CPP_AlignN(n) /* Not supported. */ -#define BX_CPP_AttrPrintf(formatArg, firstArg) /* Not supported. */ -#define BX_CPP_AttrNoReturn() /* Not supported. */ - -#endif - -#define BX_DEBUGGER 0 -#define BX_DISASM 1 - -#if (BX_DEBUGGER == 1) && (BX_DISASM == 0) -#error Dissembler is required for BX_DEBUGGER ! -#endif - -#define BX_PROVIDE_CPU_MEMORY 1 -#define BX_PROVIDE_DEVICE_MODELS 1 - -#define BX_PROVIDE_MAIN 1 - -#define BX_INSTRUMENTATION 0 - -// enable BX_DEBUG/BX_ERROR/BX_INFO messages -#define BX_NO_LOGGING 0 - -// enable BX_ASSERT checks -#define BX_ASSERT_ENABLE 1 - -// limited i440FX PCI support -#define BX_SUPPORT_PCI 0 - -// Bochs VBE display interface -#define BX_SUPPORT_VBE 1 - -// CLGD54XX emulation -#define BX_SUPPORT_CLGD54XX 0 - -// ACPI controller -#define BX_SUPPORT_ACPI 0 - -#if (BX_SUPPORT_ACPI && !BX_SUPPORT_PCI) -#error To enable ACPI support, you must also enable PCI -#endif - -// Experimental VGA on PCI -#define BX_SUPPORT_PCIVGA 0 - -// Experimental host PCI device mapping -#define BX_SUPPORT_PCIDEV 0 - -#if (BX_SUPPORT_PCIDEV && !BX_SUPPORT_PCI) -#error To enable PCI host device mapping, you must also enable PCI -#endif - -// limited USB on PCI -#define BX_SUPPORT_PCIUSB 0 - -#if (BX_SUPPORT_PCIUSB && !BX_SUPPORT_PCI) -#error To enable USB, you must also enable PCI -#endif - -#define BX_SUPPORT_BUSMOUSE 0 - -#define BX_SUPPORT_ALIGNMENT_CHECK 1 -#define BX_SUPPORT_FPU 1 -#define BX_SUPPORT_MMX 1 -#define BX_SUPPORT_3DNOW 0 -#define BX_SUPPORT_SSE 2 -#define BX_SUPPORT_SSE_EXTENSION 0 -#define BX_SUPPORT_SSE4A 0 -#define BX_SUPPORT_SSE5A 0 -#define BX_SUPPORT_DAZ 1 -#define BX_SUPPORT_MISALIGNED_SSE 0 -#define BX_SUPPORT_SEP 1 -#define BX_SUPPORT_VME 1 -#define BX_SUPPORT_POPCNT 0 -#define BX_SUPPORT_MONITOR_MWAIT 0 -#define BX_SUPPORT_XSAVE 0 -#define BX_SUPPORT_AES 0 -#define BX_SUPPORT_MOVBE 0 - -#define BX_SUPPORT_MTRR 0 -#define BX_SUPPORT_LARGE_PAGES 0 -#define BX_SUPPORT_GLOBAL_PAGES 0 -#define BX_SUPPORT_PAE 0 - -#define BX_SupportGuest2HostTLB 0 -#define BX_SupportRepeatSpeedups 0 -#define BX_SupportHostAsms 0 - -#define BX_SUPPORT_ICACHE 0 -#define BX_SUPPORT_TRACE_CACHE 0 - -#if (BX_SUPPORT_TRACE_CACHE && BX_SUPPORT_ICACHE==0) -#error Trace cache optimization cannot be compiled without iCache! -#endif - -#if BX_SUPPORT_3DNOW - #define BX_CPU_VENDOR_INTEL 0 -#else - #define BX_CPU_VENDOR_INTEL 1 -#endif - -// Maximum CPUID vendor and brand string lengths -#define BX_CPUID_VENDOR_LEN 12 -#define BX_CPUID_BRAND_LEN 48 - -// if 1, don't do gpf on MSRs that we don't implement -#define BX_IGNORE_BAD_MSR 1 - -// CLFLUSH was introduced together with SSE2 instruction set -#if BX_SUPPORT_SSE >= 2 - #define BX_SUPPORT_CLFLUSH 1 -#else - #define BX_SUPPORT_CLFLUSH 0 -#endif - -#if (BX_SUPPORT_ALIGNMENT_CHECK && BX_CPU_LEVEL < 4) -#error Alignment exception check is not supported in i386 ! -#endif - -#if (BX_SUPPORT_VME && BX_CPU_LEVEL < 5) -#error With CPU level < 5, you must disable v8086 mode extensions ! -#endif - -#if (BX_SUPPORT_MMX && BX_CPU_LEVEL < 5) -#error With CPU level < 5, you must disable MMX support ! -#endif - -#if (!BX_SUPPORT_FPU && BX_CPU_LEVEL > 4) -#error With CPU level > 4, you must enable FPU support ! -#endif - -#if (BX_SUPPORT_MMX && !BX_SUPPORT_FPU) -#error "MMX cannot be compiled without FPU support !" -#endif - -#if (BX_SUPPORT_FPU && BX_CPU_LEVEL < 3) -#error "FPU cannot be compiled without cpu level >= 3 !" -#endif - -#if (BX_SUPPORT_3DNOW && !BX_SUPPORT_MMX) -#error "3DNow! cannot be compiled without MMX support !" -#endif - -#if (BX_SUPPORT_AES && !BX_SUPPORT_SSE) -#error "AES cannot be compiled without SSE support !" -#endif - -#if (BX_SUPPORT_XSAVE && !BX_SUPPORT_SSE) -#error "XSAVE cannot be compiled without SSE support !" -#endif - -#if (BX_SUPPORT_SSE && !BX_SUPPORT_MMX) -#error "SSE cannot be compiled without FPU+MMX support !" -#endif - -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_SSE) -#error "SSE is only supported with CPU_LEVEL >= 6 !" -#endif - -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_SEP) -#error "SYSENTER/SYSEXIT only supported with CPU_LEVEL >= 6 !" -#endif - -#if (BX_SUPPORT_SSE < 3) || (BX_SUPPORT_SSE == 3 && BX_SUPPORT_SSE_EXTENSION == 0) -#if BX_SUPPORT_MOVBE - #error "MOVBE only supported with SSE3E !" -#endif -#endif - -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_PAE) -#error "Physical Address Extensions (PAE) only supported with CPU_LEVEL >= 6 !" -#endif -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_GLOBAL_PAGES) -#error "Page Global Extension (PGE) only supported with CPU_LEVEL >= 6 !" -#endif -#if (BX_CPU_LEVEL<5 && BX_SUPPORT_LARGE_PAGES) -#error "Page Size Extension (PSE) only supported with CPU_LEVEL >= 5 !" -#endif -#if (BX_CPU_LEVEL<6 && BX_SUPPORT_MTRR) -#error "MTRRs only supported with CPU_LEVEL >= 6 !" -#endif - -#if (BX_SUPPORT_PAE && !BX_SUPPORT_LARGE_PAGES) -#error "Physical Address Extensions (PAE) requires large pages support !" -#endif - -#if BX_SUPPORT_X86_64 -// Sanity checks to ensure that you cannot accidently use conflicting options. - -#if BX_CPU_LEVEL < 6 -#error "X86-64 requires cpu level 6 or greater !" -#endif -#if (BX_SUPPORT_SSE<2) -#error "X86-64 requires SSE2 !" -#endif -#if !BX_SUPPORT_PAE -#error "X86-64 requires Physical Address Extensions (PAE) !" -#endif -#if !BX_SUPPORT_GLOBAL_PAGES -#error "X86-64 requires Page Global Extension (PGE) !" -#endif -#if !BX_SUPPORT_LARGE_PAGES -#error "X86-64 requires Page Size Extension (PSE) !" -#endif -#endif - -#define BX_HAVE_GETENV 1 -#define BX_HAVE_SETENV 1 -#define BX_HAVE_SELECT 1 -#define BX_HAVE_SNPRINTF 1 -#define BX_HAVE_VSNPRINTF 1 -#define BX_HAVE_STRTOULL 1 -#define BX_HAVE_STRTOUQ 1 -#define BX_HAVE_STRDUP 1 -#define BX_HAVE_STRREV 0 -#define BX_HAVE_STRUCT_TIMEVAL 1 - -// used in term gui -#define BX_HAVE_COLOR_SET 0 -#define BX_HAVE_MVHLINE 0 -#define BX_HAVE_MVVLINE 0 - - -// set if your compiler does not permit an empty struct -#define BX_NO_EMPTY_STRUCTS 0 - -// set if your compiler does not understand __attribute__ after a struct -#define BX_NO_ATTRIBUTES 0 -#if BX_NO_ATTRIBUTES -#define GCC_ATTRIBUTE(x) /* attribute not supported */ -#else -#define GCC_ATTRIBUTE __attribute__ -#endif - -// set to use fast function calls -#define BX_FAST_FUNC_CALL 0 - -// On gcc2.95+ x86 only -#if BX_FAST_FUNC_CALL && defined(__i386__) && defined(__GNUC__) && (__GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)) -#if BX_USE_CPU_SMF == 1 -# define BX_CPP_AttrRegparmN(X) __attribute__((regparm(X))) -#else -// FIXME: BX_FAST_FUNC_CALL doesn't work with BX_USE_CPU_SMF = 0 -# define BX_CPP_AttrRegparmN(X) /* Not defined */ -#endif -#else -# define BX_CPP_AttrRegparmN(X) /* Not defined */ -#endif - -// set if your compiler does not allow label at the end of a {} block -#define BX_NO_BLANK_LABELS 1 - -// set if you do have <hash_map>, used in bx_debug/dbg_main.c -#define BX_HAVE_HASH_MAP 0 - -// set if you do have <hash_map.h>, used in bx_debug/dbg_main.c -#define BX_HAVE_HASH_MAP_H 1 - -// set if you do have <set>, used in bx_debug/dbg_main.c -#define BX_HAVE_SET 1 - -// set if you do have <set.h>, used in bx_debug/dbg_main.c -#define BX_HAVE_SET_H 1 - -// Support x86 hardware debugger registers and facilites. -// These are the debug facilites offered by the x86 architecture, -// not the optional built-in debugger. -#define BX_X86_DEBUGGER 0 - -#define BX_SUPPORT_CDROM 1 - -#if BX_SUPPORT_CDROM - // This is the C++ class name to use if we are supporting - // low-level CDROM. -# define LOWLEVEL_CDROM cdrom_interface -#endif - -// NE2K network emulation -#define BX_SUPPORT_NE2K 0 - -// Pseudo PCI NIC -#define BX_SUPPORT_PCIPNIC 0 - -#if (BX_SUPPORT_PCIPNIC && !BX_SUPPORT_PCI) -#error To enable the PCI pseudo NIC, you must also enable PCI -#endif - -// this enables the lowlevel stuff below if one of the NICs is present -#define BX_NETWORKING 0 - -#define BX_ETH_NULL_LOGGING 1 -#define BX_ETH_FBSD_LOGGING 1 - -// determine which NE2K packet mover modules will be enabled -// (this was moved from iodev/eth.h) -#define ETH_NULL 1 -#ifdef BX_USE_ETH_ARPBACK -# define ETH_ARPBACK 1 -#endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__NetBSD_kernel__) || defined(__APPLE__) -#define ETH_FBSD 1 -#endif -#if defined(linux) -#define ETH_LINUX 1 -#endif -#if defined(WIN32) -#define ETH_WIN32 1 -#endif - -// this enables Ethertap packet mover; determined by configure script -#define HAVE_ETHERTAP 0 - -// this enables TUN/TAP packet mover; determined by configure script -#define HAVE_TUNTAP 0 - -// this enables VDE packet mover; determined by configure script -#define HAVE_VDE 0 - - -// I/O Interface to debug -#define BX_SUPPORT_IODEBUG 0 - -// External Debugger -#define BX_EXTERNAL_DEBUGGER 0 - -#ifdef WIN32 -#define BX_FLOPPY0_NAME "Floppy Disk A:" -#define BX_FLOPPY1_NAME "Floppy Disk B:" -#else -#define BX_FLOPPY0_NAME "Floppy Disk 0" -#define BX_FLOPPY1_NAME "Floppy Disk 1" -#endif - -#endif // _BX_CONFIG_H Added: branches/Cog/processors/IA32/bochs/exploration/Makefile =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/Makefile (rev 0) +++ branches/Cog/processors/IA32/bochs/exploration/Makefile 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,20 @@ +CFLAGS=-m32 -I.. -I../../bochs -I../../bochs/cpu -I../../bochs/instrument/stubs -L../cpu -lcpu + +all: printcpu printcpucr printcpuxmm + ./printcpu >BochsIA32Alien-regs.st + ./printcpucr >BochsIA32Alien-cr.st + ./printcpuxmm >BochsIA32Alien-xmm.st + +clean: + rm -f BochsIA32Alien-regs.st BochsIA32Alien-cr.st BochsIA32Alien-xmm.st + rm -f printcpu printcpucr printcpuxmm + rm -f printcpu.exe printcpucr.exe printcpuxmm.exe + +printcpu: printcpu.c + g++ -o $@ printcpu.c $(CFLAGS) + +printcpucr: printcpucr.c + g++ -o $@ printcpucr.c $(CFLAGS) + +printcpuxmm: printcpuxmm.c + g++ -o $@ printcpuxmm.c $(CFLAGS) Modified: branches/Cog/processors/IA32/bochs/exploration/printcpu.c =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/printcpu.c 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/exploration/printcpu.c 2011-11-12 21:10:06 UTC (rev 2510) @@ -28,19 +28,13 @@ main() { #define stoffsetof(type,field) (offsetof(type,field)+1) -#if 0 -#define print(r,n) printf(#r "@%d\n", offsetof(BX_CPU_C,gen_reg[n].dword.erx)) - - printf("EAX@%d\n",offsetof(BX_CPU_C, gen_reg[0].dword.erx)); - -#else #define print(r,n) \ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s\r\t^self unsignedLongAt: %d! !\r", m,d,y,h,i, lower(#r), \ + "%s\r\t^self unsignedLongAt: %ld! !\r", m,d,y,h,i, lower(#r), \ stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s: anUnsignedInteger\r\t^self unsignedLongAt: %d put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ - stoffsetof(BX_CPU_C,gen_reg[n].dword.erx));\ + "%s: anUnsignedInteger\r\t^self unsignedLongAt: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ + stoffsetof(BX_CPU_C,gen_reg[n].dword.erx)) time_t nowsecs = time(0); struct tm now = *localtime(&nowsecs); @@ -52,12 +46,11 @@ printf("\"Hello world!!\"!\r"); printf("!BochsIA32Alien class methodsFor: 'instance creation' stamp: 'eem %d/%d/%d %d:%02d'!\r" - "dataSize\r\t^%d! !\r", m,d,y,h,i, sizeof(BX_CPU_C)); + "dataSize\r\t^%ld! !\r", m,d,y,h,i, sizeof(BX_CPU_C)); printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r" - "eflags\r\t^self unsignedLongAt: %d! !\r", m,d,y,h,i, - stoffsetof(BX_CPU_C,eflags)); -#endif + "eflags\r\t^self unsignedLongAt: %ld! !\r", m,d,y,h,i, + stoffsetof(BX_CPU_C,eflags)); print(EAX,BX_32BIT_REG_EAX); print(EBX,BX_32BIT_REG_EBX); Modified: branches/Cog/processors/IA32/bochs/exploration/printcpucr.c =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/printcpucr.c 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/exploration/printcpucr.c 2011-11-12 21:10:06 UTC (rev 2510) @@ -32,10 +32,10 @@ #define stoffsetof(type,field) (offsetof(type,field)+1) #define print(r,ra,len) \ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s\r\t^self unsigned" #len "At: %d! !\r", m,d,y,h,i, munge(#r), \ + "%s\r\t^self unsigned" #len "At: %ld! !\r", m,d,y,h,i, munge(#r), \ stoffsetof(BX_CPU_C,ra));\ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s: anUnsignedInteger\r\t^self unsigned" #len "At: %d put: anUnsignedInteger! !\r", m,d,y,h,i, munge(#r), \ + "%s: anUnsignedInteger\r\t^self unsigned" #len "At: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, munge(#r), \ stoffsetof(BX_CPU_C,ra)); time_t nowsecs = time(0); Modified: branches/Cog/processors/IA32/bochs/exploration/printcpuxmm.c =================================================================== --- branches/Cog/processors/IA32/bochs/exploration/printcpuxmm.c 2011-11-10 02:11:13 UTC (rev 2509) +++ branches/Cog/processors/IA32/bochs/exploration/printcpuxmm.c 2011-11-12 21:10:06 UTC (rev 2510) @@ -30,10 +30,10 @@ #define stoffsetof(type,field) (offsetof(type,field)+1) #define print(r,n,lh) \ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s\r\t^self unsignedLongLongAt: %d! !\r", m,d,y,h,i, lower(#r), \ + "%s\r\t^self unsignedLongLongAt: %ld! !\r", m,d,y,h,i, lower(#r), \ stoffsetof(BX_CPU_C,xmm[n]._u64[lh]));\ printf("!BochsIA32Alien methodsFor: 'accessing' stamp: 'eem %d/%d/%d %d:%02d'!\r"\ - "%s: anUnsignedInteger\r\t^self unsignedLongLongAt: %d put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ + "%s: anUnsignedInteger\r\t^self unsignedLongLongAt: %ld put: anUnsignedInteger! !\r", m,d,y,h,i, lower(#r), \ stoffsetof(BX_CPU_C,xmm[n]._u64[lh]));\ time_t nowsecs = time(0); Added: branches/Cog/processors/IA32/linuxbochs/conf.COG =================================================================== --- branches/Cog/processors/IA32/linuxbochs/conf.COG (rev 0) +++ branches/Cog/processors/IA32/linuxbochs/conf.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,49 @@ +#!/bin/sh + +# this sets up the compile for Cog on linux. Disable as much inessential stuff +# as possible leaving only the cpu/fpu & memory interface + +# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using +# $ ./conf.COG +# $ ../bochs/makeem + +set echo +# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" +CFLAGS="-m32 $CFLAGS" +CFLAGS="-Dlongjmp=_longjmp -Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" +CFLAGS="-g $CFLAGS" +CPPFLAGS="" +CXXFLAGS="$CFLAGS" + +export CFLAGS +export CPATH +export CPPFLAGS +export CXXFLAGS +export LDFLAGS + +../bochs/configure \ + --enable-Cog \ + --enable-cpu-level=6 \ + --enable-sse=2 \ + --enable-assert-checks \ + --with-nogui \ + --disable-x86-64 \ + --disable-pae \ + --disable-large-pages \ + --disable-global-pages \ + --disable-mtrr \ + --disable-sb16 \ + --disable-ne2000 \ + --disable-pci \ + --disable-acpi \ + --disable-apic \ + --disable-clgd54xx \ + --disable-usb \ + --disable-plugins \ + ${CONFIGURE_ARGS} + +# apic == Advanced programmable Interrupt Controller +# acpi == Advanced Configuration and Power Interface +# pci == Peripheral Component Interconnect local bus +# clgd54xx == Cirrus Logic GD54xx video card Property changes on: branches/Cog/processors/IA32/linuxbochs/conf.COG ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/processors/IA32/macbochs/conf.COG =================================================================== --- branches/Cog/processors/IA32/macbochs/conf.COG (rev 0) +++ branches/Cog/processors/IA32/macbochs/conf.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,49 @@ +#!/bin/sh + +# this sets up the compile for Cog on Mac OS X. Disable as much inessential +# stuff as possible leaving only the cpu/fpu & memory interface + +# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using +# $ ./conf.COG +# $ ../bochs/makeem + +set echo +# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" +CFLAGS="-m32 $CFLAGS" +CFLAGS="-Dlongjmp=_longjmp -Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" +CFLAGS="-g $CFLAGS" +CPPFLAGS="" +CXXFLAGS="$CFLAGS" + +export CFLAGS +export CPATH +export CPPFLAGS +export CXXFLAGS +export LDFLAGS + +../bochs/configure \ + --enable-Cog \ + --enable-cpu-level=6 \ + --enable-sse=2 \ + --enable-assert-checks \ + --with-nogui \ + --disable-x86-64 \ + --disable-pae \ + --disable-large-pages \ + --disable-global-pages \ + --disable-mtrr \ + --disable-sb16 \ + --disable-ne2000 \ + --disable-pci \ + --disable-acpi \ + --disable-apic \ + --disable-clgd54xx \ + --disable-usb \ + --disable-plugins \ + ${CONFIGURE_ARGS} + +# apic == Advanced programmable Interrupt Controller +# acpi == Advanced Configuration and Power Interface +# pci == Peripheral Component Interconnect local bus +# clgd54xx == Cirrus Logic GD54xx video card Property changes on: branches/Cog/processors/IA32/macbochs/conf.COG ___________________________________________________________________ Added: svn:executable + * Added: branches/Cog/processors/IA32/winbochs/conf.COG =================================================================== --- branches/Cog/processors/IA32/winbochs/conf.COG (rev 0) +++ branches/Cog/processors/IA32/winbochs/conf.COG 2011-11-12 21:10:06 UTC (rev 2510) @@ -0,0 +1,50 @@ +#!/bin/sh + +# this sets up the compile for Cog on win32 under cygwin. Disable as much +# inessential stuff as possible leaving only the cpu/fpu & memory interface + +# build cpu/libcpu.a disasm/libdisasm.a fpu/libfpu.a using +# $ ./conf.COG +# $ ../bochs/makeem + +set echo +# CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions -falign-loops=16 -falign-jumps=16 -falign-functions=16 -falign-labels=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -fprefetch-loop-arrays $CFLAGS" +CFLAGS="-m32 $CFLAGS" +CFLAGS="-Dsetjmp=_setjmp $CFLAGS" +CFLAGS="-pipe -O3 -fomit-frame-pointer -finline-functions $CFLAGS" +CFLAGS="-g $CFLAGS" +CPPFLAGS="" +CXXFLAGS="$CFLAGS" + +export CFLAGS +export CPATH +export CPPFLAGS +export CXXFLAGS +export LDFLAGS + +../bochs/configure \ + -target=i686-pc-mingw32 \ + --enable-Cog \ + --enable-cpu-level=6 \ + --enable-sse=2 \ + --enable-assert-checks \ + --with-nogui \ + --disable-x86-64 \ + --disable-pae \ + --disable-large-pages \ + --disable-global-pages \ + --disable-mtrr \ + --disable-sb16 \ + --disable-ne2000 \ + --disable-pci \ + --disable-acpi \ + --disable-apic \ + --disable-clgd54xx \ + --disable-usb \ + --disable-plugins \ + ${CONFIGURE_ARGS} + +# apic == Advanced programmable Interrupt Controller +# acpi == Advanced Configuration and Power Interface +# pci == Peripheral Component Interconnect local bus +# clgd54xx == Cirrus Logic GD54xx video card

1 0

VM Maker: CMakeVMMaker-EstebanLorenzano.141.mcz
by commits＠source.squeak.org 11 Nov '11

11 Nov '11

Esteban Lorenzano uploaded a new version of CMakeVMMaker to project VM Maker: http://source.squeak.org/VMMaker/CMakeVMMaker-EstebanLorenzano.141.mcz ==================== Summary ==================== Name: CMakeVMMaker-EstebanLorenzano.141 Author: EstebanLorenzano Time: 11 November 2011, 2:32:38 pm UUID: e6d04194-f9ca-4a3f-8707-df35ac738397 Ancestors: CMakeVMMaker-EstebanLorenzano.140 empty log message =============== Diff against CMakeVMMaker-EstebanLorenzano.140 =============== Item was changed: ----- Method: CocoaIOSConfig>>compilerFlagsRelease (in category 'accessing') ----- compilerFlagsRelease ^#( "'-fobjc-direct-dispatch'" '-msse3' "'-msse4.1'" "'-msse4.2'" "'-mdynamic-no-pic'" "'-fwritable-strings'" '-Os' + '-fvisibility=hidden' - '-fvisibility=hidden' '-funroll-loops' "'-fno-asm'" '-fasm-blocks' '-finline-functions' '-mfpmath=sse' '-fomit-frame-pointer' '-march=pentium-m' '-mtune=prescott' '-falign-functions=16' '-fno-gcse' '-fno-cse-follow-jumps' '-std=gnu99' '-DBUILD_FOR_OSX' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DLSB_FIRST' '-DUSE_INLINE_MEMORY_ACCESSORS' '-DHAVE_SYS_TIME_H' '-DHAVE_NANOSLEEP' '-DICC_DEBUG=0' '-DICC_OPTLEVEL="speedHLO"' '-DICC_OPT_IPO_FOR_SINGLE_FILE_COMPILATION=1' '-DICC_OPT_PARALLEL=0' '-DICC_OPT_PREFETCH_INSERTION=1' '-DICC_OPT_PROVIDE_FRAME_PTR=0' '-DICC_OPT_USE_ARCH_IA32="SSE42"')!

1 0

VM Maker: VMMaker-oscog-EstebanLorenzano.139.mcz
by commits＠source.squeak.org 11 Nov '11

11 Nov '11

Esteban Lorenzano uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker-oscog-EstebanLorenzano.139.mcz ==================== Summary ==================== Name: VMMaker-oscog-EstebanLorenzano.139 Author: EstebanLorenzano Time: 11 November 2011, 2:12:44 pm UUID: 5aa53979-d7d8-4ca3-91fe-cfc3b4109c33 Ancestors: VMMaker-oscog-EstebanLorenzano.138, VMMaker-oscog-dtl.125 -merged with Dave's latest =============== Diff against VMMaker-oscog-EstebanLorenzano.138 ===============

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev November 2011