VM Maker: VMMaker.oscog-eem.180.mcz

 
Eliot Miranda uploaded a new version of VMMaker to project VM Maker:
http://source.squeak.org/VMMaker/VMMaker.oscog-eem.180.mcz

==================== Summary ====================

Name: VMMaker.oscog-eem.180
Author: eem
Time: 28 June 2012, 9:04:19.784 am
UUID: d742fc84-467e-47f9-be9e-4ba2dfa74d88
Ancestors: VMMaker.oscog-eem.179

Use workaround for broken Squeak4.3 progress exception when
generating VM source.

=============== Diff against VMMaker.oscog-eem.179 ===============

Item was changed:
  ----- Method: VMMaker>>generateCogitFile (in category 'generate sources') -----
  generateCogitFile
  "Translate the Smalltalk description of the virtual machine into C.  If 'self doInlining' is true, small method bodies are inlined to reduce procedure call overhead.  On the PPC, this results in a factor of three speedup with only 30% increase in code size.  Subclasses can use specialised versions of CCodeGenerator and interpreterClass."
 
  | cg cogitClass |
  self interpreterClass needsCogit ifFalse: [^nil].
  cg := [self buildCodeGeneratorForCogit]
  on: Notification
  do: [:ex|
  ex tag == #getVMMaker
  ifTrue: [ex resume: self]
+ ifFalse: [(ex respondsTo: #rearmHandlerDuring:)
+ ifTrue: [ex rearmHandlerDuring: [ex pass]]
+ ifFalse: [ex pass]]].
- ifFalse: [ex pass]].
  self needsToRegenerateCogitFile ifFalse: [^nil].
  cogitClass := self cogitClass.
  cg removeUnneededBuiltins.
  cg vmClass preGenerationHook: cg.
  cg storeCodeOnFile: (self sourceFilePathFor: cogitClass sourceFileName) doInlining: cogitClass doInlining.
  cg vmClass additionalHeadersDo:
  [:headerName :headerContents| | filePath |
  filePath := self coreVMDirectory fullNameFor: headerName.
  (cg needToGenerateHeader: headerName file: filePath contents: headerContents) ifTrue:
  [cg storeHeaderOnFile: filePath contents: headerContents]].
  cogitClass apiExportHeaderName ifNotNil:
  [cg storeAPIExportHeader: cogitClass apiExportHeaderName
  OnFile: (self sourceFilePathFor: cogitClass apiExportHeaderName)]!

Item was changed:
  ----- Method: VMMaker>>generateInterpreterFile (in category 'generate sources') -----
  generateInterpreterFile
  "Translate the Smalltalk description of the virtual machine into C.  If 'self doInlining' is true, small method bodies are inlined to reduce procedure call overhead.  On the PPC, this results in a factor of three speedup with only 30% increase in code size.  Subclasses can use specialised versions of CCodeGenerator and interpreterClass."
 
  | cg vmHeaderContents |
  cg := [self buildCodeGeneratorForInterpreter]
  on: Notification
  do: [:ex|
  ex tag == #getVMMaker
  ifTrue: [ex resume: self]
+ ifFalse: [(ex respondsTo: #rearmHandlerDuring:)
+ ifTrue: [ex rearmHandlerDuring: [ex pass]]
+ ifFalse: [ex pass]]].
- ifFalse: [ex pass]].
  self needsToRegenerateInterpreterFile ifFalse: [^nil].
  cg removeUnneededBuiltins.
  self interpreterClass preGenerationHook: cg.
 
  vmHeaderContents := cg vmHeaderContentsWithBytesPerWord: self bytesPerWord.
  (cg needToGenerateHeader: self interpreterHeaderName file: self interpreterHeaderPath contents: vmHeaderContents) ifTrue:
  [cg storeHeaderOnFile: self interpreterHeaderPath contents: vmHeaderContents].
  cg storeCodeOnFile: (self sourceFilePathFor: self interpreterClass sourceFileName) doInlining: self doInlining.
  self interpreterClass additionalHeadersDo:
  [:headerName :headerContents| | filePath |
  filePath := self coreVMDirectory fullNameFor: headerName.
  (cg needToGenerateHeader: headerName file: filePath contents: headerContents) ifTrue:
  [cg storeHeaderOnFile: filePath contents: headerContents]].
  self interpreterClass apiExportHeaderName ifNotNil:
  [cg storeAPIExportHeader: self interpreterClass apiExportHeaderName
  OnFile: (self sourceFilePathFor: self interpreterClass apiExportHeaderName)].
  (Gnuifier on: self coreVMDirectory)
  interpreterFilename: self interpreterFilename;
  gnuify.!