Vm-dev March 2015

vm-dev@lists.squeakfoundation.org

37 participants
175 discussions

Re: [Pharo-users] pharo headless and without gui. Seaside app
by phil＠highoctane.be 13 Mar '15

13 Mar '15

There is WinMain in sqWin32Intel.c and LRESULT CALLBACK MainWndProcW(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) is in sqWin32Window.c http://stackoverflow.com/questions/18709403/winmain-vs-main-c sqWin32Service.c has Windows service support but I don't know how this works. In WinMain, we get this: case 1: /* full usage */ abortMessage(TEXT("%s"), TEXT("Usage: " VM_NAME " [vmOptions] imageFile [imageOptions]\n\n") TEXT("vmOptions:") /* TEXT("\n\t-service: ServiceName \t(install Squeak as NT service)") */ TEXT("\n\t--headless \t\t(force Squeak to run headless)") TEXT("\n\t--timephases (print start load and run times)") TEXT("\n\t--log: LogFile \t\t(use LogFile for VM messages)") But the code appears to still exist... parseVMArgument(int argc, char *argv[]) { /* flags */ if (!strcmp(argv[0], "--help")) { printUsage(1); return 1; } else if (!strcmp(argv[0], "--version")) { versionInfo(); return 1; } else if (!strcmp(argv[0], "--headless")) { fHeadlessImage = true; return 1; } else if (!strcmp(argv[0], "--headfull")) { fHeadlessImage = false; return 1;} else if (!strcmp(argv[0], "--timephases")) { printPhaseTime(1); return 1; } #ifdef VISTA_SECURITY /* IE7/Vista protected mode support */ /* started with low rights, use alternate untrustedUserDirectory */ else if (!strcmp(argv[0], "--lowRights")) { fLowRights = true; return 1; } #endif /* VISTA_SECURITY */ #if (STACKVM || NewspeakVM) && !COGVM else if (!strcmp(argv[0], "--sendtrace")) { extern sqInt sendTrace; sendTrace = 1; return 1; } #endif /* parameters */ else if (argc > 1 && !strcmp(argv[0], "--service")) { installServiceName = argv[1]; return 2; } else if (!strncmp(argv[0], "--service:", 9)) { installServiceName = argv[0] + 9; return 1; } else if (argc > 1 && !strcmp(argv[0], "--log")) { logName = argv[1]; return 2; } else if (!strncmp(argv[0], "--log:", 5)) { logName = argv[0] + 5; return 1; } But despite these options, there is no service nor headless thing working atm. What is the basic thing to do to get Pharo running as a service? I can compile the Windows VM, so, the next step would be to get this working. Which I could do if pointed in a given direction by VM experts who are in the know. A lot of the Windows VM code is Andreas code but we need to take that back into our hands. Phil On Fri, Mar 13, 2015 at 6:00 PM, Esteban Lorenzano <estebanlm(a)gmail.com> wrote: > squeak vm info is for squeak vm, not for pharo vm (which has some > differences… for example). > > I will ask you again to give us more information about your command line, > what you are trying to do, etc. > > otherwise you will stay flipping around, because people will answer in > general… not very useful for you. > > Esteban > > On 13 Mar 2015, at 16:21, Pablo R. Digonzelli <pdigonzelli(a)gmail.com> wrote: > > I understand , wher can i get Andrea's command line info? > TIA > > Ing. Pablo Digonzelli > Software Solutions > IP-Solutiones SRL > Metrotec SRL > 25 de Mayo 521 > San Miguel de Tucumán > Email: pdigonzelli(a)softsargentina.com > pdigonzelli(a)gmail.com > Cel: 5493815982714 > > ----- Mensaje original ----- > De: "David T. Lewis" <lewis(a)mail.msen.com> > Para: "Any question about pharo is welcome" <pharo-users(a)lists.pharo.org> > Enviados: Jueves, 12 de Marzo 2015 20:54:20 > Asunto: Re: [Pharo-users] pharo headless and without gui. Seaside app > > On Thu, Mar 12, 2015 at 06:23:28PM -0300, Pablo R. Digonzelli wrote: > > I think phil is right. -vm-display-null is the question . it aborts the > process. > Does not matter wich vm and image are you using. > For example i am trying pharo4 latest image latest vm. > > > The -vm-display-null parameter is specific to Ian Piumarta's unix VM. It is > part of the loadable VM module system that he made for sound and displays. > You will find this in the various VMs that run on top of Ian platform code. > The Windows VMs originate from Andreas Raab's code base, which has different > VM command line parameters. > > For common things like starting a headless VM, it would be a good idea to > make the command line parameters consistent across VMs. Maybe that could be > done most easily in the start scripts, as opposed to the VM executables. > > Dave > > > > > TIA > > > Ing. Pablo Digonzelli > Software Solutions > IP-Solutiones SRL > Metrotec SRL > 25 de Mayo 521 > San Miguel de Tucum??n > Email: pdigonzelli(a)softsargentina.com > pdigonzelli(a)gmail.com > Cel: 5493815982714 > > > De: "Esteban Lorenzano" <estebanlm(a)gmail.com> > Para: "Any question about pharo is welcome" <pharo-users(a)lists.pharo.org> > Enviados: Jueves, 12 de Marzo 2015 17:42:55 > Asunto: Re: [Pharo-users] pharo headless and without gui. Seaside app > > > > > > On 12 Mar 2015, at 21:23, phil(a)highoctane.be wrote: > > > > Headless on windows is not working I think. > > > > that???s not related, ???no-quit should be working (and ???headless should > be letting a window in the try). > > can you provide more information? > > vm version? > image version? > anything relevant? > > just asking without information is like going to the doctor and just say > ???it hurts me?????? not much we can do to help. > > Esteban > > > BQ_BEGIN > > > > There is code in the VM but it looks more dead than alive. There is a > console version of Squeak and we may want to revive that. There us even code > for a Windows service in there... > > Phil > Le 12 mars 2015 20:41, "Pablo R. Digonzelli" < pdigonzelli(a)gmail.com > a > ??crit : > > BQ_BEGIN > > Hi again, i cannot do it work for a windows 2012 server. it seems --no-quit > does not work . > Any suggestion? > > > TIA > > > Ing. Pablo Digonzelli > Software Solutions > IP-Solutiones SRL > Metrotec SRL > 25 de Mayo 521 > San Miguel de Tucum??n > Email: pdigonzelli(a)softsargentina.com > pdigonzelli(a)gmail.com > Cel: 5493815982714 > > > De: "Pablo Digonzelli" < pdigonzelli(a)gmail.com > > Para: "Any question about pharo is welcome" < pharo-users(a)lists.pharo.org > > Enviados: Jueves, 12 de Marzo 2015 16:20:08 > Asunto: Re: [Pharo-users] pharo headless and without gui. Seaside app > > Hi, i solve the problem! > > ./pharo-vm/pharo -vm-display-null -vm-sound-null --plugins ./pharo-vm > --encoding utf8 imagefile.image --no-quit > > works very well > > TIA > > > Ing. Pablo Digonzelli > Software Solutions > IP-Solutiones SRL > Metrotec SRL > 25 de Mayo 521 > San Miguel de Tucum??n > Email: pdigonzelli(a)softsargentina.com > pdigonzelli(a)gmail.com > Cel: 5493815982714 > > > De: "pablo digonzelli" < pdigonzelli(a)softsargentina.dyndns.biz > > Para: "Any question about pharo is welcome" < pharo-users(a)lists.pharo.org > > Enviados: Jueves, 12 de Marzo 2015 15:47:49 > Asunto: pharo headless and without gui. Seaside app > > I need to run pharo headless and without gui for a Seaside app i am working > on. > I user pharo -vm-display-null --headless imagefile and does not work. > May be someone can help me. > TIA > > > Ing. Pablo Digonzelli > Software Solutions > IP-Solutiones SRL > Metrotec SRL > 25 de Mayo 521 > San Miguel de Tucum??n > Email: pdigonzelli(a)softsargentina.com > pdigonzelli(a)gmail.com > Cel: 5493815982714 > > > BQ_END > > > BQ_END > > -- --- Philippe Back Visible Performance Improvements Mob: +32(0) 478 650 140 | Fax: +32 (0) 70 408 027 Mail:phil@highoctane.be | Web: http://philippeback.eu Blog: http://philippeback.be | Twitter: @philippeback Youtube: http://www.youtube.com/user/philippeback/videos High Octane SPRL rue cour Boisacq 101 | 1301 Bierges | Belgium Pharo Consortium Member - http://consortium.pharo.org/ Featured on the Software Process and Measurement Cast - http://spamcast.libsyn.com Sparx Systems Enterprise Architect and Ability Engineering EADocX Value Added Reseller

1 0

VM Maker: VMMaker.oscog-tpr.1092.mcz
by commits＠source.squeak.org 13 Mar '15

13 Mar '15

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.1092.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.1092 Author: tpr Time: 13 March 2015, 10:19:11.654 am UUID: ff3802c0-8550-4a16-baef-1a4b359ef4b1 Ancestors: VMMaker.oscog-tpr.1091 Small improvements to some code and mostly comment improvements so there is some hope of making sense of this later on =============== Diff against VMMaker.oscog-tpr.1091 =============== Item was changed: CogAbstractInstruction subclass: #CogARMCompiler instanceVariableNames: '' + classVariableNames: 'AL AddOpcode AndOpcode BICCqR BicOpcode CArg0Reg CArg1Reg CArg2Reg CArg3Reg CC CS CmpOpcode EQ GE GT HI LDMFD LE LR LS LT MI NE OrOpcode PC PL R0 R1 R10 R11 R12 R2 R3 R4 R5 R6 R7 R8 R9 RISCTempReg RsbOpcode SP STMFD SubOpcode VC VS XorOpcode' - classVariableNames: 'AL AddOpcode AndOpcode BICCqR BicOpcode CArg0Reg CArg1Reg CArg2Reg CArg3Reg CC CS CmpOpcode EQ GE GT HI LDMFD LE LR LS LT MI NE OrOpcode PC PL R0 R1 R10 R11 R12 R2 R3 R4 R5 R6 R7 R8 R9 RISCTempReg SP STMFD SubOpcode VC VS XorOpcode' poolDictionaries: '' category: 'VMMaker-JIT'! !CogARMCompiler commentStamp: 'lw 8/23/2012 19:38' prior: 0! I generate ARM instructions from CogAbstractInstructions. For reference see http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.set.architectur… The Architecture Reference Manual used is that of version 5, which includes some version 6 instructions. Of those, only pld is used(for PrefetchAw). This class does not take any special action to flush the instruction cache on instruction-modification.! Item was changed: ----- Method: CogARMCompiler class>>initialize (in category 'class initialization') ----- initialize "Initialize various ARM instruction-related constants." "CogARMCompiler initialize" | specificOpcodes refs | super initialize. self ~~ CogARMCompiler ifTrue: [^self]. R0 := 0. R1 := 1. R2 := 2. R3 := 3. R4 := 4. R5 := 5. R6 := 6. R7 := 7. R8 := 8. R9 := 9. R10 := 10. R11 := 11. R12 := 12.. SP := 13.. LR := 14. PC := 15. CArg0Reg := 0. CArg1Reg := 1. CArg2Reg := 2. CArg3Reg := 3. RISCTempReg := R10. "Condition Codes. Note that cc=16rF is NOT ALLOWED as a condition; it specifies an extension instruction. See e.g.ARM_ARM v5 DDI01001.pdf A3.2.1" EQ := 0. NE := 1. CS := 2. CC := 3. MI := 4. PL := 5. VS := 6. VC := 7. HI := 8. LS := 9. GE := 10. LT := 11. GT := 12. LE := 13. AL := 14. AddOpcode := 4. AndOpcode := 0. BicOpcode := 16rE. CmpOpcode := 10. OrOpcode := 16rC. + RsbOpcode := 3. SubOpcode := 2. XorOpcode := 1. "Specific instructions" LastRTLCode isNil ifTrue: [CogRTLOpcodes initialize]. specificOpcodes := #(LDMFD STMFD BICCqR). refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect: [:ea| ea key]. (classPool keys reject: [:k| (specificOpcodes includes: k) or: [refs includes: k]]) do: [:k| Undeclared declare: k from: classPool]. specificOpcodes withIndexDo: [:classVarName :value| self classPool declare: classVarName from: Undeclared; at: classVarName put: value + LastRTLCode - 1]! Item was changed: ----- Method: CogARMCompiler>>add:rn:imm:ror: (in category 'ARM convenience instructions') ----- add: destReg rn: srcReg imm: immediate ror: rot + "Remember the ROR is doubled by the cpu so use 30>>1 etc. + ADD destReg, srcReg, #immediate ROR #rot" - "return an ADD destReg, srcReg, immediat ROR rot instruction. Remember the ROR is doubled by the cpu so use 30>>1 etc" + ^self type: 1 op: AddOpcode set: 0 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! - ^self type: 1 op: 4 set: 0 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogARMCompiler>>add:rn:rm: (in category 'ARM convenience instructions') ----- add: destReg rn: srcReg rm: addReg + "return an ADD destReg, srcReg, addReg instruction + ADD destReg, srcReg, addReg" - "return an ADD destReg, srcReg, addReg instruction" + ^self type: 0 op: AddOpcode set: 0 rn: srcReg rd: destReg shifterOperand: addReg! - ^self type: 0 op: 4 set: 0 rn: srcReg rd: destReg shifterOperand: addReg! Item was changed: ----- Method: CogARMCompiler>>adds:rn:imm:ror: (in category 'ARM convenience instructions') ----- adds: destReg rn: srcReg imm: immediate ror: rot + "Remember the ROR is doubled by the cpu so use 30>>1 etc + ADDS destReg, srcREg, #immediate ROR #rot" - "return an ADDS destReg, srcReg, immediat ROR rot instruction. Remember the ROR is doubled by the cpu so use 30>>1 etc" + ^self type: 1 op: AddOpcode set: 1 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! - ^self type: 1 op: 4 set: 1 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogARMCompiler>>and:rn:imm:ror: (in category 'ARM convenience instructions') ----- and: destReg rn: srcReg imm: immediate ror: rot + "Remember the ROR is doubled by the cpu so use 30>>1 etc + AND destReg, srcReg, #immediate ROR #rot" - "return an AND destReg, srcReg, immediat ROR rot instruction. Remember the ROR is doubled by the cpu so use 30>>1 etc" + ^self type: 1 op: AndOpcode set: 0 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! - ^self type: 1 op: 0 set: 0 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogARMCompiler>>ands:rn:imm:ror: (in category 'ARM convenience instructions') ----- ands: destReg rn: srcReg imm: immediate ror: rot + "Remember the ROR is doubled by the cpu so use 30>>1 etc + ANDS destReg, srcReg, #immediate ROR #rot" - "return an ANDS destReg, srcReg, immediat ROR rot instruction. Remember the ROR is doubled by the cpu so use 30>>1 etc" + ^self type: 1 op: AndOpcode set: 1 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! - ^self type: 1 op: 0 set: 1 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogARMCompiler>>b: (in category 'ARM convenience instructions') ----- b: offset + "return a B offset instruction; offset is signed 24bits of WORD offset, so +_32Mbyte range + B offset" - "return a B offset instruction" ^self cond: AL br: 0 offset: offset ! Item was changed: ----- Method: CogARMCompiler>>bics:rn:imm:ror: (in category 'ARM convenience instructions') ----- bics: destReg rn: srcReg imm: immediate ror: rot + "Remember the ROR is doubled by the cpu so use 30>>1 etc + BICS destReg, srcReg, #immediate ROR #rot" - "return a BICS destReg, srcReg, immediat ROR rot instruction. Remember the ROR is doubled by the cpu so use 30>>1 etc" ^self type: 1 op: 14 set: 1 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogARMCompiler>>bl: (in category 'ARM convenience instructions') ----- bl: offset + "return a BL offset instruction; offset is signed 24bits of WORD offset, so +_32Mbyte range. Return address is in LR + BL offset" - "return a BL offset instruction" ^self cond: AL br: 1 offset: offset ! Item was changed: ----- Method: CogARMCompiler>>blx: (in category 'ARM convenience instructions') ----- blx: targetReg + "Branch&link to the address in targetReg. Return address is in LR + BX targetReg" - "return a BX targetReg instruction" ^self cond: AL bx: 1 target: targetReg ! Item was changed: ----- Method: CogARMCompiler>>bx: (in category 'ARM convenience instructions') ----- bx: targetReg + "Branch to address in targetReg. + BX targetReg" - "return a BX targetReg instruction" ^self cond: AL bx: 0 target: targetReg ! Item was changed: ----- Method: CogARMCompiler>>callTargetFromReturnAddress: (in category 'inline cacheing') ----- callTargetFromReturnAddress: callSiteReturnAddress + "Answer the address that the call immediately preceeding callSiteReturnAddress will jump to." + "this is also used by #jumpLongTargetBeforeFollowingAddress: and so we check for both call and jump related instructions; later on we can use simpler tests once it feels safe to assume we get here always with a call/jump in the proper place" - "Answer the address the call immediately preceeding callSiteReturnAddress will jump to." - "this is also used by #jumpLongTargetBeforeFOllowingAddress: and so we check for both call and jump related instructions; later on we can use simpler tests once it feels safe to assume we get here always with a call/jump in the proper place" | callDistance call | call := self instructionBeforeAddress: callSiteReturnAddress. self assert: call ~= 0. "andeq r0, r0 will not be generated, not even as nops" ((self instructionIsB: call) or:[self instructionIsBL: call]) ifTrue: [ "a short call/jump" callDistance := self extractOffsetFromBL: call. ^callSiteReturnAddress + 4 + callDistance signedIntFromLong]. ((self instructionIsBX: call) or:[self instructionIsBLX: call]) ifTrue:["A Long Call/Jump. Extract the value saved to RISCTempReg from all the instructions before." ^self extractOffsetFromBXAt: callSiteReturnAddress - 4]. self halt ! Item was changed: ----- Method: CogARMCompiler>>concretizeCall (in category 'generate machine code - concretize') ----- concretizeCall "Will get inlined into concretizeAt: switch." <inline: true> + "build either a + BL offset + or + {move offset to offsetReg} + BLX offsetReg + instruction sequence. In production VMs we expect never to have long calls within generated code" | offset | self assert: (operands at: 0) ~= 0. self assert: (operands at: 0) \\ 4 = 0. offset := (operands at: 0) signedIntFromLong - (address + 8 "normal pc offset") signedIntFromLong. (self isQuick: offset) ifTrue: [ self machineCodeAt: 0 put: (self bl: offset). "BL offset" ^machineCodeSize := 4] ifFalse: [ "self error: 'While we know how to generate a long distance call, we can''t update such a send site yet. Please restart with smaller cache size'." ^self concretizeLongCall]! Item was added: + ----- Method: CogARMCompiler>>concretizeMoveM16rR (in category 'generate machine code - concretize') ----- + concretizeMoveM16rR + "Will get inlined into concretizeAt: switch." + "ldrh destReg, [srcReg, #immediate], + or + move offset to RISCTempReg + ldrh destReg, [srcReg, RISCTempReg]" + <inline: true> + | srcReg offset destReg instrOffset| + offset := operands at: 0. + srcReg := self concreteRegister: (operands at: 1). + destReg := self concreteRegister: (operands at: 2). + self is8BitValue: offset + ifTrue: [ :u :immediate | + self machineCodeAt: 0 + "ldrh destReg, [srcReg, #immediate]" + put: (self ldrh: destReg rn: srcReg plus: u imm: immediate). + ^machineCodeSize := 4] + ifFalse: [ + instrOffset := self at: 0 moveCw: offset intoR: RISCTempReg. + "ldrh destReg, [srcReg, RISCTempReg]" + self machineCodeAt: instrOffset put: (self ldrh: destReg rn: srcReg rm: RISCTempReg). + ^machineCodeSize := instrOffset + 4 ]! Item was changed: ----- Method: CogARMCompiler>>concretizeNegateR (in category 'generate machine code - concretize') ----- concretizeNegateR "Will get inlined into concretizeAt: switch." <inline: true> | reg | reg := self concreteRegister: (operands at: 0). + "RSB destReg, srcReg, #0" + self machineCodeAt: 0 put: (self type: 1 op: RsbOpcode set: 0 rn: reg rd: reg). - "rsb r?, r?, #0" - self machineCodeAt: 0 put: (self type: 1 op: 3 set: 0 rn: reg rd: reg). ^machineCodeSize := 4! Item was changed: ----- Method: CogARMCompiler>>cond:type:op:set: (in category 'encoding') ----- cond: c type: t op: o set: s "c : 4 bit, t: 3 bit, o: 4 bit, s: 1bit" + "cccctttoooos + oxFFFFF - the leftmost 12bits of (most) ARM instruction. The other 20 bits get built elsewhere" - "cccctttoooos + oxFFFFF - the leftmost 12bit of (most) ARM instruction" <inline: true> ^ c << 28 bitOr: ((t << 25) bitOr: ((o << 21) bitOr: (s << 20)))! Item was changed: ----- Method: CogARMCompiler>>cond:type:op:set:rn:rd:shifterOperand: (in category 'encoding') ----- cond: conditionCode type: type op: flagsOrOpcode set: doUpdateStatusRegister rn: sourceRegister rd: targetRegister shifterOperand: so + "build an instruction - cccctttoooo + source + target + shifter op" <inline: true> ^(self cond: conditionCode type: type op: flagsOrOpcode set: doUpdateStatusRegister rn: sourceRegister rd: targetRegister) bitOr: (so bitAnd: 16rFFF)! Item was changed: ----- Method: CogARMCompiler>>genGetLeafCallStackPointerFunction (in category 'assertions') ----- genGetLeafCallStackPointerFunction + "create a tiny leaf function that just returns the SP in r0 " - "create a tiny leaf function that just returns the SP in r0; doesn't seem to actually get used. " cogit MoveR: SP R: R0. cogit RetN: 0! Item was changed: ----- Method: CogARMCompiler>>instructionBeforeAddress: (in category 'inline cacheing') ----- instructionBeforeAddress: followingAddress "Answer the instruction immediately preceeding followingAddress." + ^objectMemory longAt: followingAddress -4! - ^objectMemory longAt: followingAddress -4 - - " old version - ^ ((objectMemory byteAt: followingAddress - 1 235) << 24) - + ((objectMemory byteAt: followingAddress - 2) << 16) - + ((objectMemory byteAt: followingAddress - 3) << 8) - + (objectMemory byteAt: followingAddress - 4)" - ! Item was added: + ----- Method: CogARMCompiler>>is8BitValue:ifTrue:ifFalse: (in category 'testing') ----- + is8BitValue: constant ifTrue: trueAlternativeBlock ifFalse: falseAlternativeBlock + "For extended LDR and STR for half & double, there is an instruction allowing for one instruction encoding if the offset is encodable in 8 bit." + constant abs <= 255 "(2 raisedTo: 8)-1" + ifTrue: [ + constant >= 0 + ifTrue: [trueAlternativeBlock value: 1 value: constant] + ifFalse: [trueAlternativeBlock value: 0 value: constant abs]] + ifFalse: falseAlternativeBlock! Item was changed: ----- Method: CogARMCompiler>>ldr:rn:plus:imm: (in category 'ARM convenience instructions') ----- ldr: destReg rn: baseReg plus: u imm: immediate12bitValue + " LDR destReg, [baseReg, immediate12bitValue] u=0 -> subtract imm; =1 -> add imm " - "return a LDR destReg, [baseReg, 'u' immediate12bitValue]" ^self memMxr: AL reg: destReg base: baseReg u: u b: 0 l: 1 imm: immediate12bitValue! Item was changed: ----- Method: CogARMCompiler>>ldr:rn:plusImm: (in category 'ARM convenience instructions') ----- ldr: destReg rn: baseReg plusImm: immediate12bitValue + " LDR destReg, [baseReg, +immediate12bitValue]" - "return a LDR destReg, [baseReg, +immediate12bitValue]" ^self memMxr: AL reg: destReg base: baseReg u: 1 b: 0 l: 1 imm: immediate12bitValue! Item was changed: ----- Method: CogARMCompiler>>ldr:rn:rm: (in category 'ARM convenience instructions') ----- ldr: destReg rn: baseReg rm: offsetReg + " LDR destReg, [baseReg, + offsetReg] + The contents of offsetReg are assumed to be correctly signed" - "return a LDR destReg, [baseReg, + offsetReg] The contents of offsetReg are assumed to be correctly signed" ^self memMxr: AL reg: destReg base: baseReg p: 1 u: 1 b: 0 w: 0 l: 1 rm: offsetReg! Item was changed: ----- Method: CogARMCompiler>>ldrb:rn:plus:imm: (in category 'ARM convenience instructions') ----- ldrb: destReg rn: baseReg plus: u imm: immediate12bitValue + " LDRB destReg, [baseReg, 'u' immediate12bitValue] u=0 -> subtract imm; =1 -> add imm " - "return a LDRB destReg, [baseReg, 'u' immediate12bitValue]" ^self memMxr: AL reg: destReg base: baseReg u: u b: 1 l: 1 imm: immediate12bitValue! Item was changed: ----- Method: CogARMCompiler>>ldrb:rn:rm: (in category 'ARM convenience instructions') ----- ldrb: destReg rn: baseReg rm: offsetReg + " LDR destReg, [baseReg, + offsetReg] + The contents of offsetReg are assumed to be correctly signed" - "return a LDR destReg, [baseReg, + offsetReg] The contents of offsetReg are assumed to be correctly signed" ^self memMxr: AL reg: destReg base: baseReg p: 1 u: 1 b: 1 w: 0 l: 1 rm: offsetReg! Item was added: + ----- Method: CogARMCompiler>>ldrh:rn:plus:imm: (in category 'ARM convenience instructions') ----- + ldrh: destReg rn: baseReg plus: u imm: immediate8bitValue + " LDRH destReg, [baseReg, 'u' immediate8bitValue] u=0 -> subtract imm; =1 -> add imm " + ^self memM16xr: AL reg: destReg base: baseReg p: 1 u: u w: 0 l: 1 offset: immediate8bitValue! Item was added: + ----- Method: CogARMCompiler>>ldrh:rn:rm: (in category 'ARM convenience instructions') ----- + ldrh: destReg rn: baseReg rm: offsetReg + " LDRH destReg, [baseReg, +offsetReg] + The contents of offsetReg are assumed to be correctly signed" + ^self memM16xr: AL reg: destReg base: baseReg p: 1 u: 1 w: 0 l: 1 rm: offsetReg! Item was added: + ----- Method: CogARMCompiler>>memM16xr:reg:base:p:u:w:l:offset: (in category 'encoding') ----- + memM16xr: cond reg: destReg base: baseReg p: postpreoffset u: updown w: weirdstuff l: loadstore offset: offset8 + "build an ARM [base +/- offset8] half-word memory instruction + p -> pre-index (1) or post-index (0) the offset. Combines with W to do some odd things. + u -> up (1) or down (0) ie + or - for the offset + b -> byte(1) or word (0) + w -> write-back (1) if pre-indexing. + l -> load (1) or store (0)" + ^ cond << 28 + bitOr: (0 << 25 + bitOr: (postpreoffset << 24 + bitOr: (updown << 23 + bitOr: (1 << 22 + bitOr: (weirdstuff << 21 + bitOr: (loadstore << 20 + bitOr: (baseReg << 16 + bitOr: (destReg << 12 + bitOr: ((offset8 bitAnd: 16rF0) << 4 + bitOr: (11 << 4 + bitOr: (offset8 bitAnd: 16rF)))))))))))! Item was added: + ----- Method: CogARMCompiler>>memM16xr:reg:base:p:u:w:l:rm: (in category 'encoding') ----- + memM16xr: cond reg: destReg base: baseReg p: postpreoffset u: updown w: weirdstuff l: loadstore rm: offsetReg + "build an ARM [base +/- offsetReg] memory instruction + p -> pre-index (1) or post-index (0) the offset. Combines with W to do some odd things. + u -> up (1) or down (0) ie + or - for the offset + b -> byte(1) or word (0) + w -> write-back (1) if pre-indexing. + l -> load (1) or store (0)" + ^ cond << 28 + bitOr: (0 << 25 + bitOr: (postpreoffset << 24 + bitOr: (updown << 23 + bitOr: (0 << 22 + bitOr: (weirdstuff << 21 + bitOr: (loadstore << 20 + bitOr: (baseReg << 16 + bitOr: (destReg << 12 + bitOr: (16rB0 + bitOr: offsetReg)))))))))! Item was removed: - ----- Method: CogARMCompiler>>minimalRightRingRotationFor:initialRotation: (in category 'encoding') ----- - minimalRightRingRotationFor: constant initialRotation: iniRightRingRotation - "Given a constant and some initial rotation, tries to minimize that rotation in an effort to encode the according byte in constant. This is used, to encode the last 12bit of many operations, for which a 8bit immediate rotated by (2*)4bit is available. That immediate need be encoded with minimal rotation." - | byte rightRingRotation | - rightRingRotation := iniRightRingRotation. - "Counter rotation to get the according byte. Because Smalltalk does not have left ring shift, shift further right." - rightRingRotation ~= 0 ifTrue: [ - byte := constant >> (-2 * rightRingRotation + 32) bitAnd: 16rFF. - "For 0, the shift has to be 0. For other immediates, the encoding with minimal rightRingRotation should be choosen." - byte = 0 - ifTrue: [ rightRingRotation := 0] - ifFalse: [ - 0 to: 2 do: [ :j | - (byte bitAnd: 16r03) = 0 - ifTrue: [ rightRingRotation := rightRingRotation - 1. - byte := byte >> 2 ]]]] - ifFalse: [ byte := constant bitAnd: 16rFF]. - ^{rightRingRotation. byte}! Item was changed: ----- Method: CogARMCompiler>>mov:imm:ror: (in category 'ARM convenience instructions') ----- + mov: destReg imm: immediate8bitValue ror: rot + "Remember the ROR is doubled by the cpu so use 30>>1 etc. + MOV destReg, #immediate8BitValue ROR rot" + ^self type: 1 op: 16rD set: 0 rn: 0 rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate8bitValue)! - mov: destReg imm: immediate8bitValue ror: rotateRightBy - "return the ARM instruction MOV destReg, #immediate8BitValue ROR rotateRightBy" - ^self type: 1 op: 16rD set: 0 rn: 0 rd: destReg shifterOperand: ((rotateRightBy>>1) <<8 bitOr: immediate8bitValue)! Item was changed: ----- Method: CogARMCompiler>>mov:rn: (in category 'ARM convenience instructions') ----- mov: destReg rn: srcReg + " MOV destReg, srcReg" - "return a MOV destReg, srcReg instruction" ^self type: 0 op: 16rD set: 0 rn: 0 rd: destReg shifterOperand: srcReg! Item was changed: ----- Method: CogARMCompiler>>movs:rn: (in category 'ARM convenience instructions') ----- movs: destReg rn: srcReg + " MOVS destReg, srcReg" - "return a MOV destReg, srcReg instruction" ^self type: 0 op: 16rD set: 1 rn: 0 rd: destReg shifterOperand: srcReg! Item was changed: ----- Method: CogARMCompiler>>orr:imm:ror: (in category 'ARM convenience instructions') ----- + orr: destReg imm: immediate8bitValue ror: rot + "Remember the ROR is doubled by the cpu so use 30>>1 etc. + ORR destReg, #immediate8BitValue ROR rot" + ^self type: 1 op: 16rC set: 0 rn: destReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate8bitValue)! - orr: destReg imm: immediate8bitValue ror: rotateRightBy - "return the ARM instruction ORR destReg, #immediate8BitValue ROR rotateRightBy" - ^self type: 1 op: 16rC set: 0 rn: destReg rd: destReg shifterOperand: ((rotateRightBy>>1) <<8 bitOr: immediate8bitValue)! Item was changed: ----- Method: CogARMCompiler>>popR: (in category 'ARM convenience instructions') ----- popR: dstReg + " pop word off TOS + LDR srcReg, [sp] #4" - "return a pop - LDR srcReg, [sp] #4" ^self memMxr: AL reg: dstReg base: SP p: 0 u: 1 b: 0 w: 0 l: 1 imm: 4! Item was changed: ----- Method: CogARMCompiler>>pushR: (in category 'ARM convenience instructions') ----- pushR: srcReg + " push word to TOS + STR srcReg, [sp, #-4]!!" - "return a push - STR srcReg, [sp, #-4]!!" ^self memMxr: AL reg: srcReg base: SP p: 1 u: 0 b: 0 w: 1l: 0 imm: 4! Item was changed: ----- Method: CogARMCompiler>>str:rn:plus:imm: (in category 'ARM convenience instructions') ----- str: destReg rn: baseReg plus: u imm: immediate12bitValue + " STR destReg, [baseReg, 'u' immediate12bitValue] u=0 -> subtract imm; =1 -> add imm " - "return a STR destReg, [baseReg, 'u' immediate12bitValue]" ^self memMxr: AL reg: destReg base: baseReg u: u b: 0 l: 0 imm: immediate12bitValue! Item was changed: ----- Method: CogARMCompiler>>str:rn:plusImm: (in category 'ARM convenience instructions') ----- str: srcReg rn: baseReg plusImm: immediate12bitValue + " STR srcReg, [baseReg, +immediate12bitValue]" - "return a STR srcReg, [baseReg, +immediate12bitValue]" ^self memMxr: AL reg: srcReg base: baseReg u: 1 b: 0 l: 0 imm: immediate12bitValue! Item was changed: ----- Method: CogARMCompiler>>str:rn:rm: (in category 'ARM convenience instructions') ----- str: srcReg rn: baseReg rm: offsetReg + " STR srcReg, [baseReg, + offsetReg] + The contents of offsetReg are assumed to be correctly signed" - "return a STR srcReg, [baseReg, + offsetReg] The contents of offsetReg are assumed to be correctly signed" ^self memMxr: AL reg: srcReg base: baseReg p: 1 u: 1 b: 0 w: 0 l: 0 rm: offsetReg! Item was changed: ----- Method: CogARMCompiler>>strb:rn:plus:imm: (in category 'ARM convenience instructions') ----- strb: destReg rn: baseReg plus: u imm: immediate12bitValue + " STRB destReg, [baseReg, 'u' immediate12bitValue] u=0 -> subtract imm; =1 -> add imm " - "return a STRB destReg, [baseReg, 'u' immediate12bitValue]" ^self memMxr: AL reg: destReg base: baseReg u: u b: 1 l: 0 imm: immediate12bitValue! Item was changed: ----- Method: CogARMCompiler>>strb:rn:rm: (in category 'ARM convenience instructions') ----- strb: srcReg rn: baseReg rm: offsetReg + " STRB srcReg, [baseReg, + offsetReg] + The contents of offsetReg are assumed to be correctly signed" - "return a STRB srcReg, [baseReg, + offsetReg] The contents of offsetReg are assumed to be correctly signed" ^self memMxr: AL reg: srcReg base: baseReg p: 1 u: 1 b: 1 w: 0 l: 0 rm: offsetReg! Item was changed: ----- Method: CogARMCompiler>>subs:rn:imm:ror: (in category 'ARM convenience instructions') ----- subs: destReg rn: srcReg imm: immediate ror: rot + " Remember the ROR is doubled by the cpu so use 30>>1 etc + SUBS destReg, srcReg, #immediate ROR rot" - "return a SUBDS destReg, srcReg, immediat ROR rot instruction. Remember the ROR is doubled by the cpu so use 30>>1 etc" ^self type: 1 op: 2 set: 1 rn: srcReg rd: destReg shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogARMCompiler>>tst:rn:imm:ror: (in category 'ARM convenience instructions') ----- tst: ignored rn: srcReg imm: immediate ror: rot + " Remember the ROR is doubled by the cpu so use 30>>1 etc" + "also note that TST has no destReg + TST srcReg, #immediate ROR rot" - "return a TST srcReg, immediat ROR rot instruction. Remember the ROR is doubled by the cpu so use 30>>1 etc" - "also note that TST has no destREg" ^self type: 1 op: 8 set: 1 rn: srcReg rd: 0 shifterOperand: ((rot>>1) <<8 bitOr: immediate)!

1 0

Generating large negative integer literals
by Nicolas Cellier 12 Mar '15

12 Mar '15

Eliot, when generating a large negative integer literal (more than 31 bits) we might need the suffix L (if sizeof long == 8) or LL. Here is an attempt that allways generate LL (but you might do better according to size of long). BTW when generating spur stack 64, I noticed some ULLLL constants presumably due to : SystemNavigation default browseAllCallsOn: 'LL' -> generateShiftLeft:on:indent: cheers Nicolas

1 0

VM Maker: VMMaker.oscog-tpr.1091.mcz
by commits＠source.squeak.org 12 Mar '15

12 Mar '15

tim Rowledge uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-tpr.1091.mcz ==================== Summary ==================== Name: VMMaker.oscog-tpr.1091 Author: tpr Time: 12 March 2015, 2:38:37.189 pm UUID: f570cbcd-13a8-4dc8-9cb9-2714d07ca58e Ancestors: VMMaker.oscog-tpr.1090 second attempt to save tpr.1090 It'll all end in tears =============== Diff against VMMaker.oscog-eem.1089 =============== Item was changed: CogAbstractInstruction subclass: #CogARMCompiler instanceVariableNames: '' + classVariableNames: 'AL AddOpcode AndOpcode BICCqR BicOpcode CArg0Reg CArg1Reg CArg2Reg CArg3Reg CC CS CmpOpcode EQ GE GT HI LDMFD LE LR LS LT MI NE OrOpcode PC PL R0 R1 R10 R11 R12 R2 R3 R4 R5 R6 R7 R8 R9 RISCTempReg SP STMFD SubOpcode VC VS XorOpcode' - classVariableNames: 'AL BICCqR CArg0Reg CArg1Reg CArg2Reg CArg3Reg CC CS EQ GE GT HI LDMFD LE LR LS LT MI NE PC PL R0 R1 R10 R11 R12 R2 R3 R4 R5 R6 R7 R8 R9 RISCTempReg SP STMFD VC VS' poolDictionaries: '' category: 'VMMaker-JIT'! !CogARMCompiler commentStamp: 'lw 8/23/2012 19:38' prior: 0! I generate ARM instructions from CogAbstractInstructions. For reference see http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.set.architectur… The Architecture Reference Manual used is that of version 5, which includes some version 6 instructions. Of those, only pld is used(for PrefetchAw). This class does not take any special action to flush the instruction cache on instruction-modification.! Item was changed: ----- Method: CogARMCompiler class>>initialize (in category 'class initialization') ----- initialize "Initialize various ARM instruction-related constants." "CogARMCompiler initialize" | specificOpcodes refs | super initialize. self ~~ CogARMCompiler ifTrue: [^self]. R0 := 0. R1 := 1. R2 := 2. R3 := 3. R4 := 4. R5 := 5. R6 := 6. R7 := 7. R8 := 8. R9 := 9. R10 := 10. R11 := 11. R12 := 12.. SP := 13.. LR := 14. PC := 15. CArg0Reg := 0. CArg1Reg := 1. CArg2Reg := 2. CArg3Reg := 3. RISCTempReg := R10. "Condition Codes. Note that cc=16rF is NOT ALLOWED as a condition; it specifies an extension instruction. See e.g.ARM_ARM v5 DDI01001.pdf A3.2.1" EQ := 0. NE := 1. CS := 2. CC := 3. MI := 4. PL := 5. VS := 6. VC := 7. HI := 8. LS := 9. GE := 10. LT := 11. GT := 12. LE := 13. AL := 14. + + AddOpcode := 4. + AndOpcode := 0. + BicOpcode := 16rE. + CmpOpcode := 10. + OrOpcode := 16rC. + SubOpcode := 2. + XorOpcode := 1. - "Specific instructions" LastRTLCode isNil ifTrue: [CogRTLOpcodes initialize]. specificOpcodes := #(LDMFD STMFD BICCqR). refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect: [:ea| ea key]. (classPool keys reject: [:k| (specificOpcodes includes: k) or: [refs includes: k]]) do: [:k| Undeclared declare: k from: classPool]. specificOpcodes withIndexDo: [:classVarName :value| self classPool declare: classVarName from: Undeclared; at: classVarName put: value + LastRTLCode - 1]! Item was changed: ----- Method: CogARMCompiler>>callInstructionByteSize (in category 'accessing') ----- callInstructionByteSize + "we only get to use quick B[LX] calls. We hope" ^4! Item was changed: ----- Method: CogARMCompiler>>computeMaximumSize (in category 'generate machine code') ----- computeMaximumSize "Because we don't use Thumb, each ARM instruction has 4 bytes. Some abstract opcodes need more than one instruction." | rotateableAt0then4or20Block | rotateableAt0then4or20Block := [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| maxSize := 4] ifFalse: [maxSize := 20]]. (opcode between: FirstShortJump and: LastJump) ifTrue: [^maxSize := 16]. opcode caseOf: { [Label] -> [^maxSize := 0]. [AlignmentNops] -> [^maxSize := (operands at: 0) - 1]. [MoveAwR] -> [^maxSize := 20]. [MoveCqR] -> [^self rotateable8bitImmediate: (operands at: 0) ifTrue: [:r :i| maxSize := 4] ifFalse: [maxSize := 16]]. [MoveCwR] -> [^maxSize := 16]. [MoveRAw] -> [^maxSize := 20]. [MoveRMwr] -> [self is12BitValue: (operands at: 1) ifTrue: [ :u :i | ^maxSize := 4] ifFalse: [ ^maxSize := 20 ]]. [MoveRMbr] -> [self is12BitValue: (operands at: 1) ifTrue: [ :u :i | ^maxSize := 4] ifFalse: [ ^maxSize := 20 ]]. [MoveMwrR] -> [self is12BitValue: (operands at: 0) ifTrue: [ :u :i | ^maxSize := 4] ifFalse: [ ^maxSize := 20 ]]. [MoveMbrR] -> [self is12BitValue: (operands at: 0) ifTrue: [ :u :i | ^maxSize := 4] ifFalse: [ ^maxSize := 20 ]]. [PrefetchAw] -> [^maxSize := 20]. [Call] -> [^maxSize := 20 "recomputed in #sizePCDependentInstruction."]. [RetN] -> [^(operands at: 0) = 0 ifTrue: [maxSize := 4] ifFalse: [maxSize := 8]]. [CmpCqR] -> [rotateableAt0then4or20Block value]. [AddCqR] -> [rotateableAt0then4or20Block value]. [BICCqR] -> [rotateableAt0then4or20Block value]. [SubCqR] -> [rotateableAt0then4or20Block value]. [AndCqR] -> [rotateableAt0then4or20Block value]. [OrCqR] -> [rotateableAt0then4or20Block value]. + [TstCqR] -> [rotateableAt0then4or20Block value]. [XorCqR] -> [rotateableAt0then4or20Block value]. [CmpCwR] -> [^maxSize := 20]. [AddCwR] -> [^maxSize := 20]. [SubCwR] -> [^maxSize := 20]. [AndCwR] -> [^maxSize := 20]. [OrCwR] -> [^maxSize := 20]. [XorCwR] -> [^maxSize := 20]. [JumpR] -> [^maxSize := 4]. [JumpFPEqual] -> [^maxSize := 8]. [JumpFPNotEqual] -> [^maxSize := 8]. [JumpFPLess] -> [^maxSize := 8]. [JumpFPGreaterOrEqual]-> [^maxSize := 8]. [JumpFPGreater] -> [^maxSize := 8]. [JumpFPLessOrEqual] -> [^maxSize := 8]. [JumpFPOrdered] -> [^maxSize := 8]. [JumpFPUnordered] -> [^maxSize := 8]. [JumpLong] -> [^maxSize := 20]. [JumpLongZero] -> [^maxSize := 20]. [JumpLongNonZero] -> [^maxSize := 20]. [LoadEffectiveAddressMwrR] -> [rotateableAt0then4or20Block value]. [PushCw] -> [^maxSize := 20]. } otherwise: [^maxSize := 4]. ^4 "to keep C compiler quiet" ! Item was removed: - ----- Method: CogARMCompiler>>concretizeCmpCqR (in category 'generate machine code - concretize') ----- - concretizeCmpCqR - "Will get inlined into concretizeAt: switch." - "All other data operations write back their results. The write back register should be zero for CMP." - <inline: true> - | size | - size := self concretizeDataOperationCqR: 16rA. - machineCode at: size - 3 put: ((machineCode at: size -3) bitAnd: 16rFF). - ^size - ! Item was removed: - ----- Method: CogARMCompiler>>concretizeCmpCwR (in category 'generate machine code - concretize') ----- - concretizeCmpCwR - "Will get inlined into concretizeAt: switch." - "All other data operations write back their results. The write back register should be zero for CMP." - <inline: true> - | size | - size := self concretizeDataOperationCwR: 16rA. - machineCode at: size - 3 put: ((machineCode at: size -3) bitAnd: 16rFF). - ^size! Item was removed: - ----- Method: CogARMCompiler>>concretizeCmpRR (in category 'generate machine code - concretize') ----- - concretizeCmpRR - "Will get inlined into concretizeAt: switch." - "All other data operations write back their results. The write back register should be zero for CMP." - <inline: true> - | size | - size := self concretizeDataOperationRR: 16rA. - machineCode at: size - 3 put: ((machineCode at: size -3) bitAnd: 16rFF). - ^size! Item was changed: ----- Method: CogARMCompiler>>concretizeDataOperationCqR: (in category 'generate machine code - concretize') ----- concretizeDataOperationCqR: opcode "Will get inlined into concretizeAt: switch." "4 == Add, 2 == Sub, Xor == 1, And == 0, Or == 12, Bic == 14" <inline: true> self rotateable8bitImmediate: (operands at: 0) + ifTrue: [:rot :immediate | | rd rn | + rn := self concreteRegister: (operands at: 1). + rd := opcode = CmpOpcode ifTrue: [0] ifFalse:[rn]. + self machineCodeAt: 0 put: (self type: 1 op: opcode set: 1 rn: rn rd: rd shifterOperand: ((rot>>1)"in this usage we have to halve the rot value" << 8 bitOr: immediate)). - ifTrue: [:rot :immediate | | reg | - reg := self concreteRegister: (operands at: 1). - self machineCodeAt: 0 put: (self type: 1 op: opcode set: 1 rn: reg rd: reg shifterOperand: ((rot>>1)"in this usage we have to halve the rot value" << 8 bitOr: immediate)). ^machineCodeSize := 4] ifFalse: [^self concretizeDataOperationCwR: opcode]. ! Item was changed: ----- Method: CogARMCompiler>>concretizeDataOperationCwR: (in category 'generate machine code - concretize') ----- concretizeDataOperationCwR: opcode "Will get inlined into concretizeAt: switch." "Load the word into the RISCTempReg, then cmp R, RISCTempReg" <inline: true> + | constant rn rd instrOffset| - | constant srcDestReg instrOffset| constant := operands at: 0. + rn := (self concreteRegister: (operands at: 1)). + rd := opcode = CmpOpcode ifTrue: [0] ifFalse:[rn]. - srcDestReg := (self concreteRegister: (operands at: 1)). instrOffset := self at: 0 moveCw: constant intoR: RISCTempReg. self machineCodeAt: instrOffset + put: (self type: 0 op: opcode set: 1 rn: rn rd: rd shifterOperand: RISCTempReg). - put: (self type: 0 op: opcode set: 1 rn: srcDestReg rd: srcDestReg shifterOperand: RISCTempReg). ^machineCodeSize := instrOffset + 4! Item was changed: ----- Method: CogARMCompiler>>concretizeDataOperationRR: (in category 'generate machine code - concretize') ----- concretizeDataOperationRR: opcode "Will get inlined into concretizeAt: switch." + "Load the word into the RISCTempReg, then op R, RISCTempReg" - "Load the word into the RISCTempReg, then cmp R, RISCTempReg" <inline: true> + | rn rd srcReg | - | destReg srcReg | srcReg := self concreteRegister: (operands at: 0). + rn := (self concreteRegister: (operands at: 1)). + rd := opcode = CmpOpcode ifTrue: [0] ifFalse: [rn]. - destReg := (self concreteRegister: (operands at: 1)). self machineCodeAt: 0 + put: (self type: 0 op: opcode set: 1 rn: rn rd: rd shifterOperand: srcReg). - put: (self type: 0 op: opcode set: 1 rn: destReg rd: destReg shifterOperand: srcReg). ^machineCodeSize := 4.! Item was added: + ----- Method: CogARMCompiler>>concretizeTstCqR (in category 'generate machine code - concretize') ----- + concretizeTstCqR + "Will get inlined into concretizeAt: switch." + <inline: true> + self rotateable8bitImmediate: (operands at: 0) + ifTrue: [ :rot :immediate | | reg | + reg := self concreteRegister: (operands at: 1). + self machineCodeAt: 0 put: (self tst: reg rn: reg imm: immediate ror: rot). + ^machineCodeSize := 4] + ifFalse: [^self concretizeDataOperationCwR: 8]! Item was changed: ----- Method: CogARMCompiler>>dispatchConcretize (in category 'generate machine code') ----- dispatchConcretize "Attempt to generate concrete machine code for the instruction at address. This is the inner dispatch of concretizeAt: actualAddress which exists only to get around the branch size limits in the SqueakV3 (blue book derived) bytecode set." <returnTypeC: #void> opcode caseOf: { "Noops & Pseudo Ops" [Label] -> [^self concretizeLabel]. [AlignmentNops] -> [^self concretizeAlignmentNops]. [Fill16] -> [^self concretizeFill16]. [Fill32] -> [^self concretizeFill32]. [FillFromWord] -> [^self concretizeFillFromWord]. [Nop] -> [^self concretizeNop]. "Specific Control/Data Movement" "[LDM] -> [^self concretizeLDM]. [STM] -> [^self concretizeSTM]." "Control" [Call] -> [^self concretizeCall]. [JumpR] -> [^self concretizeJumpR]. [JumpLong] -> [^self concretizeConditionalJumpLong: AL]. [JumpLongZero] -> [^self concretizeConditionalJumpLong: EQ]. [JumpLongNonZero] -> [^self concretizeConditionalJumpLong: NE]. [Jump] -> [^self concretizeConditionalJump: AL]. [JumpZero] -> [^self concretizeConditionalJump: EQ]. [JumpNonZero] -> [^self concretizeConditionalJump: NE]. [JumpNegative] -> [^self concretizeConditionalJump: MI]. [JumpNonNegative] -> [^self concretizeConditionalJump: PL]. [JumpOverflow] -> [^self concretizeConditionalJump: VS]. [JumpNoOverflow] -> [^self concretizeConditionalJump: VC]. [JumpCarry] -> [^self concretizeConditionalJump: CS]. [JumpNoCarry] -> [^self concretizeConditionalJump: CC]. [JumpLess] -> [^self concretizeConditionalJump: LT]. [JumpGreaterOrEqual] -> [^self concretizeConditionalJump: GE]. [JumpGreater] -> [^self concretizeConditionalJump: GT]. [JumpLessOrEqual] -> [^self concretizeConditionalJump: LE]. [JumpBelow] -> [^self concretizeConditionalJump: CC]. "unsigned lower" [JumpAboveOrEqual] -> [^self concretizeConditionalJump: CS]. "unsigned greater or equal" [JumpAbove] -> [^self concretizeConditionalJump: HI]. [JumpBelowOrEqual] -> [^self concretizeConditionalJump: LS]. [JumpFPEqual] -> [^self concretizeFPConditionalJump: EQ]. [JumpFPNotEqual] -> [^self concretizeFPConditionalJump: NE]. "[JumpFPLess] -> [^self concretizeFPConditionalJump: LT]. [JumpFPGreaterOrEqual] -> [^self concretizeFPConditionalJump: GE]. [JumpFPGreater] -> [^self concretizeFPConditionalJump: GT]. [JumpFPLessOrEqual] -> [^self concretizeFPConditionalJump: LE]. [JumpFPOrdered] -> [^self concretizeFPConditionalJump: VC]. [JumpFPUnordered] -> [^self concretizeFPConditionalJump: VS]." [RetN] -> [^self concretizeRetN]. "Arithmetic" [AddCqR] -> [^self concretizeAddCqR]. + [AddCwR] -> [^self concretizeDataOperationCwR: AddOpcode]. + [AddRR] -> [^self concretizeDataOperationRR: AddOpcode]. - [AddCwR] -> [^self concretizeDataOperationCwR: 4]. - [AddRR] -> [^self concretizeDataOperationRR: 4]. "[AddRdRd] -> [^self concretizeSEE2OpRdRd: 16r58]." [AndCqR] -> [^self concretizeAndCqR]. + [AndCwR] -> [^self concretizeDataOperationCwR: AndOpcode]. + [AndRR] -> [^self concretizeDataOperationRR: AndOpcode]. + [BICCqR] -> [^self concretizeDataOperationCqR: BicOpcode]. + [CmpCqR] -> [^self concretizeDataOperationCqR: CmpOpcode]. + [CmpCwR] -> [^self concretizeDataOperationCwR: CmpOpcode]. + [CmpRR] -> [^self concretizeDataOperationRR: CmpOpcode]. - [AndCwR] -> [^self concretizeDataOperationCwR: 0]. - [AndRR] -> [^self concretizeDataOperationRR: 0]. - [BICCqR] -> [^self concretizeDataOperationCqR: 16rE]. - [CmpCqR] -> [^self concretizeCmpCqR]. - [CmpCwR] -> [^self concretizeCmpCwR]. - [CmpRR] -> [^self concretizeCmpRR]. [CmpRdRd] -> [^self concretizeCmpRdRd]. "[DivRdRd] -> [^self concretizeSEE2OpRdRd: 16r5E]. [MulRdRd] -> [^self concretizeSEE2OpRdRd: 16r59]." + [OrCqR] -> [^self concretizeDataOperationCqR: OrOpcode]. + [OrCwR] -> [^self concretizeDataOperationCwR: OrOpcode]. + [OrRR] -> [^self concretizeDataOperationRR: OrOpcode]. - [OrCqR] -> [^self concretizeDataOperationCqR: 16rC]. - [OrCwR] -> [^self concretizeDataOperationCwR: 16rC]. - [OrRR] -> [^self concretizeDataOperationRR: 16rC]. [SubCqR] -> [^self concretizeSubCqR]. + [SubCwR] -> [^self concretizeDataOperationCwR: SubOpcode]. + [SubRR] -> [^self concretizeDataOperationRR: SubOpcode]. - [SubCwR] -> [^self concretizeDataOperationCwR: 2]. - [SubRR] -> [^self concretizeDataOperationRR: 2]. "[SubRdRd] -> [^self concretizeSEE2OpRdRd: 16r5C]." [SqrtRd] -> [^self concretizeSqrtRd]. + [TstCqR] -> [^self concretizeTstCqR]. + [XorCqR] -> [^self concretizeDataOperationCqR: XorOpcode]. + [XorCwR] -> [^self concretizeDataOperationCwR: XorOpcode]. + [XorRR] -> [^self concretizeDataOperationRR: XorOpcode]. - [XorCqR] -> [^self concretizeDataOperationCqR: 1]. - [XorCwR] -> [^self concretizeDataOperationCwR: 1]. - [XorRR] -> [^self concretizeDataOperationRR: 1]. [NegateR] -> [^self concretizeNegateR]. [LoadEffectiveAddressMwrR] -> [^self concretizeLoadEffectiveAddressMwrR]. [ArithmeticShiftRightCqR] -> [^self concretizeArithmeticShiftRightCqR]. [LogicalShiftRightCqR] -> [^self concretizeLogicalShiftRightCqR]. [LogicalShiftLeftCqR] -> [^self concretizeLogicalShiftLeftCqR]. [ArithmeticShiftRightRR] -> [^self concretizeArithmeticShiftRightRR]. [LogicalShiftLeftRR] -> [^self concretizeLogicalShiftLeftRR]. [LogicalShiftRightRR] -> [^self concretizeLogicalShiftRightRR]. "Data Movement" [MoveCqR] -> [^self concretizeMoveCqR]. [MoveCwR] -> [^self concretizeMoveCwR]. [MoveRR] -> [^self concretizeMoveRR]. [MoveAwR] -> [^self concretizeMoveAwR]. [MoveRAw] -> [^self concretizeMoveRAw]. "While the two MoveMbR and MoveMwR are quite similar (off by 1 bit), they differ way more to MoveM16R and MoveM64R. Because of that, they are not merged." [MoveMbrR] -> [^self concretizeMoveMbrR]. [MoveRMbr] -> [^self concretizeMoveRMbr]. [MoveM16rR] -> [^self concretizeMoveM16rR]. [MoveM64rRd] -> [^self concretizeMoveM64rRd]. [MoveMwrR] -> [^self concretizeMoveMwrR]. [MoveXbrRR] -> [^self concretizeMoveXbrRR]. [MoveRXbrR] -> [^self concretizeMoveRXbrR]. [MoveXwrRR] -> [^self concretizeMoveXwrRR]. [MoveRXwrR] -> [^self concretizeMoveRXwrR]. [MoveRMwr] -> [^self concretizeMoveRMwr]. [MoveRdM64r] -> [^self concretizeMoveRdM64r]. [PopR] -> [^self concretizePopR]. [PushR] -> [^self concretizePushR]. [PushCw] -> [^self concretizePushCw]. [PrefetchAw] -> [^self concretizePrefetchAw]. "Conversion" [ConvertRRd] -> [^self concretizeConvertRRd]. "ARM specific opcodes" [LDMFD] -> [^self concretizeLDMFD]. [STMFD] -> [^self concretizeSTMFD] }! Item was changed: ----- Method: CogARMCompiler>>genAlignCStackSavingRegisters:numArgs:wordAlignment: (in category 'abi') ----- genAlignCStackSavingRegisters: saveRegs numArgs: numArgs wordAlignment: alignment + "ARM doesn't push the first 4 arguments. Now, currently Cog doesn't use more than 4 args so we should never need to push any - but just in case we'll check for it" + | wordsPushedModAlignment delta | + wordsPushedModAlignment := ((saveRegs ifTrue: [self numberOfSaveableRegisters] ifFalse: [0]) + + (numArgs > 4 ifTrue:[numArgs - 4] ifFalse:[0])) + \\ alignment. + wordsPushedModAlignment ~= 0 ifTrue: + [delta := alignment - wordsPushedModAlignment. + cogit SubCq: delta * 4 R: SPReg]. - "ARM needs 8 byte stack alignment but it's hard to be sure where the stack is at this - point due to the complexities of whether we push the return address or not. So do - a simple bitAnd to effectively round-down the SP - except the vagaries of the ARM - instruction set means we actually need a BIC sp, sp, $7" - ^0! Item was added: + ----- Method: CogARMCompiler>>tst:rn:imm:ror: (in category 'ARM convenience instructions') ----- + tst: ignored rn: srcReg imm: immediate ror: rot + "return a TST srcReg, immediat ROR rot instruction. Remember the ROR is doubled by the cpu so use 30>>1 etc" + "also note that TST has no destREg" + + ^self type: 1 op: 8 set: 1 rn: srcReg rd: 0 shifterOperand: ((rot>>1) <<8 bitOr: immediate)! Item was changed: ----- Method: CogAbstractInstruction>>genAlignCStackSavingRegisters:numArgs:wordAlignment: (in category 'abi') ----- genAlignCStackSavingRegisters: saveRegs numArgs: numArgs wordAlignment: alignment | wordsPushedModAlignment delta | wordsPushedModAlignment := ((saveRegs ifTrue: [self numberOfSaveableRegisters] ifFalse: [0]) + numArgs) \\ alignment. wordsPushedModAlignment ~= 0 ifTrue: [delta := alignment - wordsPushedModAlignment. cogit SubCq: delta * 4 R: SPReg]. ^0! Item was changed: ----- Method: CogObjectRepresentationForSqueakV3>>genGetInlineCacheClassTagFrom:into:forEntry: (in category 'compile abstract instructions') ----- genGetInlineCacheClassTagFrom: sourceReg into: destReg forEntry: forEntry "Extract the inline cache tag for the object in sourceReg into destReg. The inline cache tag for a given object is the value loaded in inline caches to distinguish objects of different classes. In Spur this is either the tags for immediates, or the receiver's classIndex. The inline cache tag for a given object is the value loaded in inline caches to distinguish objects of different classes. In SqueakV3 the tag is the integer tag bit for SmallIntegers (1), the compact class index shifted by log: 2 word size for objects with compact classes (1 * 4 to: 31 * 4 by: 4), or the class. These ranges cannot overlap because the heap (and hence the lowest class object) is beyond the machine code zone. If forEntry is true answer the entry label at which control is to enter (cmEntryOffset). If forEntry is false, control enters at the start." | entryLabel jumpIsInt jumpCompact | <var: #entryLabel type: #'AbstractInstruction *'> <var: #jumpIsInt type: #'AbstractInstruction *'> <var: #jumpCompact type: #'AbstractInstruction *'> cogit AlignmentNops: (objectMemory wordSize max: 8). entryLabel := cogit Label. + cogit backEnd hasLinkRegister + ifFalse:[ cogit MoveR: sourceReg R: destReg. + cogit AndCq: 1 R: destReg] + ifTrue:[cogit TstCq: 1 R: sourceReg]. "<---- this works for ARM but is not yet implemented for x86" - cogit MoveR: sourceReg R: destReg. - cogit AndCq: 1 R: destReg. jumpIsInt := cogit JumpNonZero: 0. "Get header word in destReg" cogit MoveMw: 0 r: sourceReg R: destReg. "Extract the compact class field, and if non-zero use it as the tag.." self assert: self compactClassFieldMask << objectMemory compactClassFieldLSB < objectMemory nilObject asUnsignedInteger. cogit AndCq: self compactClassFieldMask << objectMemory compactClassFieldLSB R: destReg. jumpCompact := cogit JumpNonZero: 0. cogit MoveMw: objectMemory classFieldOffset r: sourceReg R: destReg. "The use of signedIntFromLong is a hack to get round short addressing mode computations. Much easier if offsets are signed and the arithmetic machinery we have makes it difficult to mix signed and unsigned offsets." cogit AndCq: AllButTypeMask signedIntFromLong R: destReg. jumpCompact jmpTarget: (jumpIsInt jmpTarget: cogit Label). ^entryLabel! Item was changed: SharedPool subclass: #CogRTLOpcodes instanceVariableNames: '' + classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LinkReg LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM32rR MoveM64rRd MoveMbrR MoveMwrR MoveRAb MoveRAw MoveRM16r MoveRM32r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRX32rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveX32rRR MoveXbrRR MoveXowrR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PCReg PopR PrefetchAw PushCw PushR ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg TstCqR XorCqR XorCwR XorRR' - classVariableNames: 'AddCqR AddCwR AddRR AddRdRd AlignmentNops AndCqR AndCwR AndRR Arg0Reg Arg1Reg ArithmeticShiftRightCqR ArithmeticShiftRightRR Call ClassReg CmpCqR CmpCwR CmpRR CmpRdRd ConvertRRd DPFPReg0 DPFPReg1 DPFPReg2 DPFPReg3 DPFPReg4 DPFPReg5 DPFPReg6 DPFPReg7 DivRdRd FPReg Fill16 Fill32 Fill8 FillBytesFrom FillFromWord FirstJump FirstShortJump GPRegMax GPRegMin Jump JumpAbove JumpAboveOrEqual JumpBelow JumpBelowOrEqual JumpCarry JumpFPEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPLess JumpFPLessOrEqual JumpFPNotEqual JumpFPOrdered JumpFPUnordered JumpGreater JumpGreaterOrEqual JumpLess JumpLessOrEqual JumpLong JumpLongNonZero JumpLongZero JumpNegative JumpNoCarry JumpNoOverflow JumpNonNegative JumpNonZero JumpOverflow JumpR JumpZero Label LastJump LastRTLCode LinkReg LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR LogicalShiftLeftCqR LogicalShiftLeftRR LogicalShiftRightCqR LogicalShiftRightRR MoveAbR MoveAwR MoveC32R MoveC64R MoveCqR MoveCwR MoveM16rR MoveM32rR MoveM64rRd MoveMbrR MoveMwrR MoveRAb MoveRAw MoveRM16r MoveRM32r MoveRMbr MoveRMwr MoveRR MoveRX16rR MoveRX32rR MoveRXbrR MoveRXowr MoveRXwrR MoveRdM64r MoveRdRd MoveX16rRR MoveX32rRR MoveXbrRR MoveXowrR MoveXwrRR MulCqR MulCwR MulRR MulRdRd NegateR Nop OrCqR OrCwR OrRR PCReg PopR PrefetchAw PushCw PushR ReceiverResultReg RetN SPReg SendNumArgsReg SqrtRd SubCqR SubCwR SubRR SubRdRd TempReg XorCqR XorCwR XorRR' poolDictionaries: '' category: 'VMMaker-JIT'! !CogRTLOpcodes commentStamp: '<historical>' prior: 0! I am a pool for the Register-Transfer-Language to which Cog compiles. I define unique integer values for all RTL opcodes and abstract registers. See CogAbstractInstruction for instances of instructions with the opcodes that I define.! Item was changed: ----- Method: CogRTLOpcodes class>>initialize (in category 'class initialization') ----- initialize "Abstract opcodes are a compound of a one word operation specifier and zero or more operand type specifiers. e.g. MoveRR is the Move opcode with two register operand specifiers and defines a move register to register instruction from operand 0 to operand 1. The word and register size is assumed to be either 32-bits on a 32-bit architecture or 64-bits on a 64-bit architecture. (self initialize) The operand specifiers are R - general purpose register Rd - double-precision floating-point register Cq - a quick constant that can be encoded in the minimum space possible. Cw - a constant with word size where word is the default operand size for the Smalltalk VM, 32-bits for a 32-bit VM, 64-bits for a 64-bit VM. The generated constant must occupy the default number of bits. This allows e.g. a garbage collector to update the value without invalidating the code. C32 - a constant with 32 bit size. The generated constant must occupy 32 bits. C64 - a constant with 64 bit size. The generated constant must occupy 64 bits. Aw - memory word with an absolute address Ab - memory byte with an absolute address Mwr - memory word whose address is at a constant offset from an address in a register Mbr - memory byte whose address is at a constant offset from an address in a register M16r - memory 16-bit halfword whose address is at a constant offset from an address in a register M32r - memory 32-bit halfword whose address is at a constant offset from an address in a register M64r - memory 64-bit doubleword whose address is at a constant offset from an address in a register XbrR - memory word whose address is r * byte size away from an address in a register X16rR - memory word whose address is r * (2 bytes size) away from an address in a register XwrR - memory word whose address is r * word size away from an address in a register XowrR - memory word whose address is (r * word size) + o away from an address in a register (scaled indexed) An alternative would be to decouple opcodes from operands, e.g. Move := 1. Add := 2. Sub := 3... RegisterOperand := 1. ConstantQuickOperand := 2. ConstantWordOperand := 3... But not all combinations make sense and even fewer are used so we stick with the simple compound approach. The assumption is that comparison and arithmetic instructions set condition codes and that move instructions leave the condition codes unaffected. In particular LoadEffectiveAddressMwrR does not set condition codes although it can be used to do arithmetic. Not all of the definitions in opcodeDefinitions below are implemented. In particular we do not implement the XowrR scaled index addressing mode since it requires 4 operands. Note that there are no generic division instructions defined, but a processor may define some." | opcodeNames refs | FPReg := -1. SPReg := -2. ReceiverResultReg := GPRegMax := -3. TempReg := -4. ClassReg := -5. SendNumArgsReg := -6. Arg0Reg := -7. Arg1Reg := GPRegMin := -8. DPFPReg0 := -9. DPFPReg1 := -10. DPFPReg2 := -11. DPFPReg3 := -12. DPFPReg4 := -13. DPFPReg5 := -14. DPFPReg6 := -15. DPFPReg7 := -16. LinkReg := -17. PCReg := -18. opcodeNames := #("Noops & Pseudo Ops" Label AlignmentNops FillBytesFrom "output operand 0's worth of bytes from the address in operand 1" Fill8 "output a byte's worth of bytes with operand 0" Fill16 "output two byte's worth of bytes with operand 0" Fill32 "output four byte's worth of bytes with operand 0" FillFromWord "output BytesPerWord's worth of bytes with operand 0 + operand 1" Nop "Control" Call RetN JumpR "Not a regular jump, i.e. not pc dependent." "N.B. Jumps are contiguous. Long jumps are contigiuous within them. See FirstJump et al below" JumpLong JumpLongZero "a.k.a. JumpLongEqual" JumpLongNonZero "a.k.a. JumpLongNotEqual" Jump JumpZero "a.k.a. JumpEqual" JumpNonZero "a.k.a. JumpNotEqual" JumpNegative JumpNonNegative JumpOverflow JumpNoOverflow JumpCarry JumpNoCarry JumpLess "signed" JumpGreaterOrEqual JumpGreater JumpLessOrEqual JumpBelow "unsigned" JumpAboveOrEqual JumpAbove JumpBelowOrEqual JumpFPEqual JumpFPNotEqual JumpFPLess JumpFPLessOrEqual JumpFPGreater JumpFPGreaterOrEqual JumpFPOrdered JumpFPUnordered "Data Movement; destination is always last operand" MoveRR MoveAwR MoveRAw MoveAbR MoveRAb MoveMwrR MoveRMwr MoveXwrRR MoveRXwrR MoveXowrR MoveRXowr MoveM16rR MoveRM16r MoveX16rRR MoveRX16rR MoveM32rR MoveRM32r MoveX32rRR MoveRX32rR MoveMbrR MoveRMbr MoveXbrRR MoveRXbrR MoveCqR MoveCwR MoveC32R MoveC64R MoveRdRd MoveM64rRd MoveRdM64r PopR PushR PushCw PrefetchAw "Arithmetic; destination is always last operand except Cmp; CmpXR is SubRX with no update of result" LoadEffectiveAddressMwrR LoadEffectiveAddressXowrR "Variants of add/multiply" NegateR "2's complement negation" ArithmeticShiftRightCqR ArithmeticShiftRightRR LogicalShiftRightCqR LogicalShiftRightRR LogicalShiftLeftCqR LogicalShiftLeftRR CmpRR AddRR SubRR AndRR OrRR XorRR MulRR CmpCqR AddCqR SubCqR AndCqR OrCqR XorCqR MulCqR CmpCwR AddCwR SubCwR AndCwR OrCwR XorCwR MulCwR + CmpRdRd AddRdRd SubRdRd MulRdRd DivRdRd TstCqR SqrtRd - CmpRdRd AddRdRd SubRdRd MulRdRd DivRdRd SqrtRd "Conversion" ConvertRRd LastRTLCode). "Magic auto declaration. Add to the classPool any new variables and nuke any obsolete ones, and assign values" "Find the variables directly referenced by this method" refs := (thisContext method literals select: [:l| l isVariableBinding and: [classPool includesKey: l key]]) collect: [:ea| ea key]. "Move to Undeclared any opcodes in classPool not in opcodes or this method." (classPool keys reject: [:k| (opcodeNames includes: k) or: [refs includes: k]]) do: [:k| Undeclared declare: k from: classPool]. "Declare as class variables and number elements of opcodeArray above" opcodeNames withIndexDo: [:classVarName :value| self classPool declare: classVarName from: Undeclared; at: classVarName put: value]. "For CogAbstractInstruction>>isJump etc..." FirstJump := JumpLong. LastJump := JumpFPUnordered. FirstShortJump := Jump. "And now initialize the backends; they add their own opcodes and hence these must be reinitialized." (Smalltalk classNamed: #CogAbstractInstruction) ifNotNil: [:cogAbstractInstruction| cogAbstractInstruction allSubclasses do: [:sc| sc initialize]]! Item was added: + ----- Method: Cogit>>TstCq:R: (in category 'abstract instructions') ----- + TstCq: quickConstant R: reg + <inline: true> + <returnTypeC: #'AbstractInstruction *'> + ^self gen: TstCqR operand: quickConstant operand: reg!

1 0

VM Maker: VMMaker.oscog-eem.1089.mcz
by commits＠source.squeak.org 12 Mar '15

12 Mar '15

Eliot Miranda uploaded a new version of VMMaker to project VM Maker: http://source.squeak.org/VMMaker/VMMaker.oscog-eem.1089.mcz ==================== Summary ==================== Name: VMMaker.oscog-eem.1089 Author: eem Time: 12 March 2015, 1:49:08.029 pm UUID: 6d131d84-5bb4-469d-984b-8750f8432147 Ancestors: VMMaker.oscog-eem.1088 Implement genRestoreRegs and improve comments. Use = instead of == in genRestoreRegsExcept: =============== Diff against VMMaker.oscog-eem.1088 =============== Item was removed: - ----- Method: CogARMCompiler>>genRestoreRegisters (in category 'abi') ----- - genRestoreRegisters - "Load the general purpose registers after the return of a trampoline call." - "Because no registers were saved we don't restore any." - "cogit - gen: LDMFD operand: 16r7F"! Item was added: + ----- Method: CogARMCompiler>>genRestoreRegs (in category 'abi') ----- + genRestoreRegs + "Restore the general purpose registers for a trampoline call." + "Restore none, because the ARM ABI only defines callee saved registers, no caller-saved regs." + "cogit gen: LDMFD operand: 16r7F"! Item was changed: ----- Method: CogARMCompiler>>genSaveRegisters (in category 'abi') ----- genSaveRegisters "Save the general purpose registers for a trampoline call." + "Save none, because the ARM ABI only defines callee saved registers, no caller-saved regs." + "cogit gen: STMFD operand: 16r7F"! - "Save none, because we use only callee saved registers." - "cogit - gen: STMFD operand: 16r7F"! Item was changed: ----- Method: CogIA32Compiler>>genRestoreRegsExcept: (in category 'abi') ----- genRestoreRegsExcept: abstractReg | realReg | realReg := self concreteRegister: abstractReg. + realReg = EAX ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: EAX]. + realReg = EBX ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: EBX]. + realReg = ECX ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: ECX]. + realReg = EDX ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: EDX]. + realReg = ESI ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: ESI]. + realReg = EDI ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: EDI]. - realReg == EAX ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: EAX]. - realReg == EBX ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: EBX]. - realReg == ECX ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: ECX]. - realReg == EDX ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: EDX]. - realReg == ESI ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: ESI]. - realReg == EDI ifTrue: [cogit AddCq: 4 R: ESP] ifFalse: [cogit PopR: EDI]. ^0!

1 0

[commit][3272] Nuke gnuconfig.h include in sqGdbARMPlugin.c, now surplus to requirements
by commits＠squeakvm.org 12 Mar '15

12 Mar '15

Revision: 3272 Author: eliot Date: 2015-03-12 12:40:56 -0700 (Thu, 12 Mar 2015) Log Message: ----------- Nuke gnuconfig.h include in sqGdbARMPlugin.c, now surplus to requirements Modified Paths: -------------- trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c Property Changed: ---------------- trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h Modified: trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c =================================================================== --- trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2015-03-12 19:36:29 UTC (rev 3271) +++ trunk/platforms/Cross/plugins/GdbARMPlugin/sqGdbARMPlugin.c 2015-03-12 19:40:56 UTC (rev 3272) @@ -3,7 +3,6 @@ #include "GdbARMPlugin.h" //disassembler -#include <gdbconfig.h> /* TPR - <---- this is actually a *link* to the gdb gdb-7.6/bfd/config.h because it otherwise clashes with the Squeak one also in the assorted include paths. Must be a proper way to handle this case; it must happen elsewhere */ #include <bfd.h> #include <dis-asm.h> Property changes on: trunk/platforms/Cross/plugins/sqPluginsSCCSVersion.h ___________________________________________________________________ Modified: checkindate - Fri Jan 30 18:15:18 PST 2015 + Thu Mar 12 12:41:12 PDT 2015

1 0

[commit][3271] Make sure to make ubnix configure on CentOS 5.3; Making it on 6.5 results in a
by commits＠squeakvm.org 12 Mar '15

12 Mar '15

Revision: 3271 Author: eliot Date: 2015-03-12 12:36:29 -0700 (Thu, 12 Mar 2015) Log Message: ----------- Make sure to make ubnix configure on CentOS 5.3; Making it on 6.5 results in a broken configure script. Modified Paths: -------------- branches/Cog/platforms/unix/config/aclocal.m4 branches/Cog/platforms/unix/config/configure Modified: branches/Cog/platforms/unix/config/aclocal.m4 =================================================================== --- branches/Cog/platforms/unix/config/aclocal.m4 2015-03-12 19:29:31 UTC (rev 3270) +++ branches/Cog/platforms/unix/config/aclocal.m4 2015-03-12 19:36:29 UTC (rev 3271) @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.9.6 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. +# 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -12,188 +12,103 @@ # PARTICULAR PURPOSE. # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -m4_define([_LT_COPYING], [dnl -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. -# Written by Gordon Matzigkeit, 1996 -# -# This file is part of GNU Libtool. -# -# GNU Libtool is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# As a special exception to the GNU General Public License, -# if you distribute this file as part of a program or library that -# is built using GNU Libtool, you may include this file under the -# same distribution terms that you use for the rest of that program. -# -# GNU Libtool 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 General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with GNU Libtool; see the file COPYING. If not, a copy -# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -# obtained by writing to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -]) +# serial 48 AC_PROG_LIBTOOL -# serial 56 LT_INIT +# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) +# ----------------------------------------------------------- +# If this macro is not defined by Autoconf, define it here. +m4_ifdef([AC_PROVIDE_IFELSE], + [], + [m4_define([AC_PROVIDE_IFELSE], + [m4_ifdef([AC_PROVIDE_$1], + [$2], [$3])])]) -# LT_PREREQ(VERSION) -# ------------------ -# Complain and exit if this libtool version is less that VERSION. -m4_defun([LT_PREREQ], -[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, - [m4_default([$3], - [m4_fatal([Libtool version $1 or higher is required], - 63)])], - [$2])]) +# AC_PROG_LIBTOOL +# --------------- +AC_DEFUN([AC_PROG_LIBTOOL], +[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl +dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX +dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. + AC_PROVIDE_IFELSE([AC_PROG_CXX], + [AC_LIBTOOL_CXX], + [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX + ])]) +dnl And a similar setup for Fortran 77 support + AC_PROVIDE_IFELSE([AC_PROG_F77], + [AC_LIBTOOL_F77], + [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 +])]) -# _LT_CHECK_BUILDDIR -# ------------------ -# Complain if the absolute build directory name contains unusual characters -m4_defun([_LT_CHECK_BUILDDIR], -[case `pwd` in - *\ * | *\ *) - AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -esac -]) +dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. +dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run +dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. + AC_PROVIDE_IFELSE([AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], + [AC_LIBTOOL_GCJ], + [ifdef([AC_PROG_GCJ], + [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([A][M_PROG_GCJ], + [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) + ifdef([LT_AC_PROG_GCJ], + [define([LT_AC_PROG_GCJ], + defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) +])])# AC_PROG_LIBTOOL -# LT_INIT([OPTIONS]) -# ------------------ -AC_DEFUN([LT_INIT], -[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -AC_BEFORE([$0], [LT_LANG])dnl -AC_BEFORE([$0], [LT_OUTPUT])dnl -AC_BEFORE([$0], [LTDL_INIT])dnl -m4_require([_LT_CHECK_BUILDDIR])dnl +# _AC_PROG_LIBTOOL +# ---------------- +AC_DEFUN([_AC_PROG_LIBTOOL], +[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl +AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl +AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl +AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl -dnl Autoconf doesn't catch unexpanded LT_ macros by default: -m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -dnl unless we require an AC_DEFUNed macro: -AC_REQUIRE([LTOPTIONS_VERSION])dnl -AC_REQUIRE([LTSUGAR_VERSION])dnl -AC_REQUIRE([LTVERSION_VERSION])dnl -AC_REQUIRE([LTOBSOLETE_VERSION])dnl -m4_require([_LT_PROG_LTMAIN])dnl - -dnl Parse OPTIONS -_LT_SET_OPTIONS([$0], [$1]) - # This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ltmain" +LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" # Always use our own libtool. LIBTOOL='$(SHELL) $(top_builddir)/libtool' AC_SUBST(LIBTOOL)dnl -_LT_SETUP +# Prevent multiple expansion +define([AC_PROG_LIBTOOL], []) +])# _AC_PROG_LIBTOOL -# Only expand once: -m4_define([LT_INIT]) -])# LT_INIT -# Old names: -AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -dnl AC_DEFUN([AM_PROG_LIBTOOL], []) - - -# _LT_CC_BASENAME(CC) -# ------------------- -# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -m4_defun([_LT_CC_BASENAME], -[for cc_temp in $1""; do - case $cc_temp in - compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; - distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; - \-*) ;; - *) break;; - esac -done -cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -]) - - -# _LT_FILEUTILS_DEFAULTS -# ---------------------- -# It is okay to use these file commands and assume they have been set -# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -m4_defun([_LT_FILEUTILS_DEFAULTS], -[: ${CP="cp -f"} -: ${MV="mv -f"} -: ${RM="rm -f"} -])# _LT_FILEUTILS_DEFAULTS - - -# _LT_SETUP -# --------- -m4_defun([_LT_SETUP], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl +# AC_LIBTOOL_SETUP +# ---------------- +AC_DEFUN([AC_LIBTOOL_SETUP], +[AC_PREREQ(2.50)dnl +AC_REQUIRE([AC_ENABLE_SHARED])dnl +AC_REQUIRE([AC_ENABLE_STATIC])dnl +AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl AC_REQUIRE([AC_CANONICAL_BUILD])dnl -_LT_DECL([], [host_alias], [0], [The host system])dnl -_LT_DECL([], [host], [0])dnl -_LT_DECL([], [host_os], [0])dnl -dnl -_LT_DECL([], [build_alias], [0], [The build system])dnl -_LT_DECL([], [build], [0])dnl -_LT_DECL([], [build_os], [0])dnl -dnl AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([LT_PATH_LD])dnl -AC_REQUIRE([LT_PATH_NM])dnl -dnl +AC_REQUIRE([AC_PROG_LD])dnl +AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl +AC_REQUIRE([AC_PROG_NM])dnl + AC_REQUIRE([AC_PROG_LN_S])dnl -test -z "$LN_S" && LN_S="ln -s" -_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl +AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl +# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! +AC_REQUIRE([AC_OBJEXT])dnl +AC_REQUIRE([AC_EXEEXT])dnl dnl -AC_REQUIRE([LT_CMD_MAX_LEN])dnl -_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -dnl -m4_require([_LT_FILEUTILS_DEFAULTS])dnl -m4_require([_LT_CHECK_SHELL_FEATURES])dnl -m4_require([_LT_CMD_RELOAD])dnl -m4_require([_LT_CHECK_MAGIC_METHOD])dnl -m4_require([_LT_CMD_OLD_ARCHIVE])dnl -m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -_LT_CONFIG_LIBTOOL_INIT([ -# See if we are running on zsh, and set the options which allow our -# commands through without removal of \ escapes INIT. -if test -n "\${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi -]) -if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST -fi +AC_LIBTOOL_SYS_MAX_CMD_LEN +AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE +AC_LIBTOOL_OBJDIR -_LT_CHECK_OBJDIR +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl +_LT_AC_PROG_ECHO_BACKSLASH -m4_require([_LT_TAG_COMPILER])dnl -_LT_PROG_ECHO_BACKSLASH - case $host_os in aix3*) # AIX sometimes has problems with the GCC collect2 program. For some @@ -208,653 +123,114 @@ # Sed substitution that helps us do robust quoting. It backslashifies # metacharacters that are still active within double-quoted strings. -sed_quote_subst='s/$[["`$\\]]$/\\\1/g' +Xsed='sed -e 1s/^X//' +[sed_quote_subst='s/$[\\"\\`$\\\\]$/\\\1/g'] # Same as above, but do not quote variable references. -double_quote_subst='s/$[["`\\]]$/\\\1/g' +[double_quote_subst='s/$[\\"\\`\\\\]$/\\\1/g'] # Sed substitution to delay expansion of an escaped shell variable in a # double_quote_subst'ed string. delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -# Sed substitution to delay expansion of an escaped single quote. -delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' - # Sed substitution to avoid accidental globbing in evaled expressions no_glob_subst='s/\*/\\\*/g' +# Constants: +rm="rm -f" + # Global variables: -ofile=libtool +default_ofile=libtool can_build_shared=yes # All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a - +ltmain="$ac_aux_dir/ltmain.sh" +ofile="$default_ofile" with_gnu_ld="$lt_cv_prog_gnu_ld" +AC_CHECK_TOOL(AR, ar, false) +AC_CHECK_TOOL(RANLIB, ranlib, :) +AC_CHECK_TOOL(STRIP, strip, :) + old_CC="$CC" old_CFLAGS="$CFLAGS" # Set sane defaults for various variables +test -z "$AR" && AR=ar +test -z "$AR_FLAGS" && AR_FLAGS=cru +test -z "$AS" && AS=as test -z "$CC" && CC=cc test -z "$LTCC" && LTCC=$CC test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS +test -z "$DLLTOOL" && DLLTOOL=dlltool test -z "$LD" && LD=ld +test -z "$LN_S" && LN_S="ln -s" +test -z "$MAGIC_CMD" && MAGIC_CMD=file +test -z "$NM" && NM=nm +test -z "$SED" && SED=sed +test -z "$OBJDUMP" && OBJDUMP=objdump +test -z "$RANLIB" && RANLIB=: +test -z "$STRIP" && STRIP=: test -z "$ac_objext" && ac_objext=o +# Determine commands to create old-style static archives. +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' +old_postinstall_cmds='chmod 644 $oldlib' +old_postuninstall_cmds= + +if test -n "$RANLIB"; then + case $host_os in + openbsd*) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + ;; + *) + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + ;; + esac + old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" +fi + _LT_CC_BASENAME([$compiler]) # Only perform the check for file, if the check method requires it -test -z "$MAGIC_CMD" && MAGIC_CMD=file case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then - _LT_PATH_MAGIC + AC_PATH_MAGIC fi ;; esac -# Use C for the default configuration in the libtool script -LT_SUPPORTED_TAG([CC]) -_LT_LANG_C_CONFIG -_LT_LANG_DEFAULT_CONFIG -_LT_CONFIG_COMMANDS -])# _LT_SETUP +AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) +AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], +enable_win32_dll=yes, enable_win32_dll=no) +AC_ARG_ENABLE([libtool-lock], + [AC_HELP_STRING([--disable-libtool-lock], + [avoid locking (might break parallel builds)])]) +test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -# _LT_PROG_LTMAIN -# --------------- -# Note that this code is called both from `configure', and `config.status' -# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -# `config.status' has no value for ac_aux_dir unless we are using Automake, -# so we pass a copy along to make sure it has a sensible value anyway. -m4_defun([_LT_PROG_LTMAIN], -[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -ltmain="$ac_aux_dir/ltmain.sh" -])# _LT_PROG_LTMAIN +AC_ARG_WITH([pic], + [AC_HELP_STRING([--with-pic], + [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], + [pic_mode="$withval"], + [pic_mode=default]) +test -z "$pic_mode" && pic_mode=default +# Use C for the default configuration in the libtool script +tagname= +AC_LIBTOOL_LANG_C_CONFIG +_LT_AC_TAGCONFIG +])# AC_LIBTOOL_SETUP -# So that we can recreate a full libtool script including additional -# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -# in macros and then make a single call at the end using the `libtool' -# label. - - -# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -# ---------------------------------------- -# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL_INIT], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_INIT], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_INIT]) - - -# _LT_CONFIG_LIBTOOL([COMMANDS]) -# ------------------------------ -# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -m4_define([_LT_CONFIG_LIBTOOL], -[m4_ifval([$1], - [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], - [$1 -])])]) - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) - - -# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -# ----------------------------------------------------- -m4_defun([_LT_CONFIG_SAVE_COMMANDS], -[_LT_CONFIG_LIBTOOL([$1]) -_LT_CONFIG_LIBTOOL_INIT([$2]) -]) - - -# _LT_FORMAT_COMMENT([COMMENT]) -# ----------------------------- -# Add leading comment marks to the start of each line, and a trailing -# full-stop to the whole comment if one is not present already. -m4_define([_LT_FORMAT_COMMENT], -[m4_ifval([$1], [ -m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], - [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -)]) - - - - - -# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -# ------------------------------------------------------------------- -# CONFIGNAME is the name given to the value in the libtool script. -# VARNAME is the (base) name used in the configure script. -# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -# VARNAME. Any other value will be used directly. -m4_define([_LT_DECL], -[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], - [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], - [m4_ifval([$1], [$1], [$2])]) - lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) - m4_ifval([$4], - [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) - lt_dict_add_subkey([lt_decl_dict], [$2], - [tagged?], [m4_ifval([$5], [yes], [no])])]) -]) - - -# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -# -------------------------------------------------------- -m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) - - -# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_tag_varnames], -[_lt_decl_filter([tagged?], [yes], $@)]) - - -# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -# --------------------------------------------------------- -m4_define([_lt_decl_filter], -[m4_case([$#], - [0], [m4_fatal([$0: too few arguments: $#])], - [1], [m4_fatal([$0: too few arguments: $#: $1])], - [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], - [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], - [lt_dict_filter([lt_decl_dict], $@)])[]dnl -]) - - -# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -# -------------------------------------------------- -m4_define([lt_decl_quote_varnames], -[_lt_decl_filter([value], [1], $@)]) - - -# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_dquote_varnames], -[_lt_decl_filter([value], [2], $@)]) - - -# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -# --------------------------------------------------- -m4_define([lt_decl_varnames_tagged], -[m4_assert([$# <= 2])dnl -_$0(m4_quote(m4_default([$1], [[, ]])), - m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), - m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -m4_define([_lt_decl_varnames_tagged], -[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) - - -# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -# ------------------------------------------------ -m4_define([lt_decl_all_varnames], -[_$0(m4_quote(m4_default([$1], [[, ]])), - m4_if([$2], [], - m4_quote(lt_decl_varnames), - m4_quote(m4_shift($@))))[]dnl -]) -m4_define([_lt_decl_all_varnames], -[lt_join($@, lt_decl_varnames_tagged([$1], - lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -]) - - -# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -# ------------------------------------ -# Quote a variable value, and forward it to `config.status' so that its -# declaration there will have the same value as in `configure'. VARNAME -# must have a single quote delimited value for this to work. -m4_define([_LT_CONFIG_STATUS_DECLARE], -[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) - - -# _LT_CONFIG_STATUS_DECLARATIONS -# ------------------------------ -# We delimit libtool config variables with single quotes, so when -# we write them to config.status, we have to be sure to quote all -# embedded single quotes properly. In configure, this macro expands -# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -# -# <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`' -m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), - [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAGS -# ---------------- -# Output comment and list of tags supported by the script -m4_defun([_LT_LIBTOOL_TAGS], -[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -available_tags="_LT_TAGS"dnl -]) - - -# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -# ----------------------------------- -# Extract the dictionary values for VARNAME (optionally with TAG) and -# expand to a commented shell variable setting: -# -# # Some comment about what VAR is for. -# visible_name=$lt_internal_name -m4_define([_LT_LIBTOOL_DECLARE], -[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], - [description])))[]dnl -m4_pushdef([_libtool_name], - m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), - [0], [_libtool_name=[$]$1], - [1], [_libtool_name=$lt_[]$1], - [2], [_libtool_name=$lt_[]$1], - [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -]) - - -# _LT_LIBTOOL_CONFIG_VARS -# ----------------------- -# Produce commented declarations of non-tagged libtool config variables -# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -# section) are produced by _LT_LIBTOOL_TAG_VARS. -m4_defun([_LT_LIBTOOL_CONFIG_VARS], -[m4_foreach([_lt_var], - m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) - - -# _LT_LIBTOOL_TAG_VARS(TAG) -# ------------------------- -m4_define([_LT_LIBTOOL_TAG_VARS], -[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), - [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) - - -# _LT_TAGVAR(VARNAME, [TAGNAME]) -# ------------------------------ -m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) - - -# _LT_CONFIG_COMMANDS +# _LT_AC_SYS_COMPILER # ------------------- -# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -# variables for single and double quote escaping we saved from calls -# to _LT_DECL, we can put quote escaped variables declarations -# into `config.status', and then the shell code to quote escape them in -# for loops in `config.status'. Finally, any additional code accumulated -# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -m4_defun([_LT_CONFIG_COMMANDS], -[AC_PROVIDE_IFELSE([LT_OUTPUT], - dnl If the libtool generation code has been placed in $CONFIG_LT, - dnl instead of duplicating it all over again into config.status, - dnl then we will have config.status run $CONFIG_LT later, so it - dnl needs to know what name is stored there: - [AC_CONFIG_COMMANDS([libtool], - [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], - dnl If the libtool generation code is destined for config.status, - dnl expand the accumulated commands and init code now: - [AC_CONFIG_COMMANDS([libtool], - [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -])#_LT_CONFIG_COMMANDS - - -# Initialize. -m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -[ - -# The HP-UX ksh and POSIX shell print the target directory to stdout -# if CDPATH is set. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -sed_quote_subst='$sed_quote_subst' -double_quote_subst='$double_quote_subst' -delay_variable_subst='$delay_variable_subst' -_LT_CONFIG_STATUS_DECLARATIONS -LTCC='$LTCC' -LTCFLAGS='$LTCFLAGS' -compiler='$compiler_DEFAULT' - -# Quote evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_quote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Double-quote double-evaled strings. -for var in lt_decl_all_varnames([[ \ -]], lt_decl_dquote_varnames); do - case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in - *[[\\\\\\\`\\"\\\$]]*) - eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" - ;; - *) - eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" - ;; - esac -done - -# Fix-up fallback echo if it was mangled by the above quoting rules. -case \$lt_ECHO in -*'\\\[$]0 --fallback-echo"')dnl " - lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` - ;; -esac - -_LT_OUTPUT_LIBTOOL_INIT -]) - - -# LT_OUTPUT -# --------- -# This macro allows early generation of the libtool script (before -# AC_OUTPUT is called), incase it is used in configure for compilation -# tests. -AC_DEFUN([LT_OUTPUT], -[: ${CONFIG_LT=./config.lt} -AC_MSG_NOTICE([creating $CONFIG_LT]) -cat >"$CONFIG_LT" <<_LTEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate a libtool stub with the current configuration. - -lt_cl_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AS_SHELL_SANITIZE -_AS_PREPARE - -exec AS_MESSAGE_FD>&1 -exec AS_MESSAGE_LOG_FD>>config.log -{ - echo - AS_BOX([Running $as_me.]) -} >&AS_MESSAGE_LOG_FD - -lt_cl_help="\ -\`$as_me' creates a local libtool stub from the current configuration, -for use in further configure time tests before the real libtool is -generated. - -Usage: $[0] [[OPTIONS]] - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - -Report bugs to <bug-libtool(a)gnu.org>." - -lt_cl_version="\ -m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -configured by $[0], generated by m4_PACKAGE_STRING. - -Copyright (C) 2008 Free Software Foundation, Inc. -This config.lt script is free software; the Free Software Foundation -gives unlimited permision to copy, distribute and modify it." - -while test $[#] != 0 -do - case $[1] in - --version | --v* | -V ) - echo "$lt_cl_version"; exit 0 ;; - --help | --h* | -h ) - echo "$lt_cl_help"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --quiet | --q* | --silent | --s* | -q ) - lt_cl_silent=: ;; - - -*) AC_MSG_ERROR([unrecognized option: $[1] -Try \`$[0] --help' for more information.]) ;; - - *) AC_MSG_ERROR([unrecognized argument: $[1] -Try \`$[0] --help' for more information.]) ;; - esac - shift -done - -if $lt_cl_silent; then - exec AS_MESSAGE_FD>/dev/null -fi -_LTEOF - -cat >>"$CONFIG_LT" <<_LTEOF -_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -_LTEOF - -cat >>"$CONFIG_LT" <<\_LTEOF -AC_MSG_NOTICE([creating $ofile]) -_LT_OUTPUT_LIBTOOL_COMMANDS -AS_EXIT(0) -_LTEOF -chmod +x "$CONFIG_LT" - -# configure is writing to config.log, but config.lt does its own redirection, -# appending to config.log, which fails on DOS, as config.log is still kept -# open by configure. Here we exec the FD to /dev/null, effectively closing -# config.log, so it can be properly (re)opened and appended to by config.lt. -if test "$no_create" != yes; then - lt_cl_success=: - test "$silent" = yes && - lt_config_lt_args="$lt_config_lt_args --quiet" - exec AS_MESSAGE_LOG_FD>/dev/null - $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false - exec AS_MESSAGE_LOG_FD>>config.log - $lt_cl_success || AS_EXIT(1) -fi -])# LT_OUTPUT - - -# _LT_CONFIG(TAG) -# --------------- -# If TAG is the built-in tag, create an initial libtool script with a -# default configuration from the untagged config vars. Otherwise add code -# to config.status for appending the configuration named by TAG from the -# matching tagged config vars. -m4_defun([_LT_CONFIG], -[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -_LT_CONFIG_SAVE_COMMANDS([ - m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl - m4_if(_LT_TAG, [C], [ - # See if we are running on zsh, and set the options which allow our - # commands through without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - - cfgfile="${ofile}T" - trap "$RM \"$cfgfile\"; exit 1" 1 2 15 - $RM "$cfgfile" - - cat <<_LT_EOF >> "$cfgfile" -#! $SHELL - -# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -_LT_COPYING -_LT_LIBTOOL_TAGS - -# ### BEGIN LIBTOOL CONFIG -_LT_LIBTOOL_CONFIG_VARS -_LT_LIBTOOL_TAG_VARS -# ### END LIBTOOL CONFIG - -_LT_EOF - - case $host_os in - aix3*) - cat <<\_LT_EOF >> "$cfgfile" -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -_LT_EOF - ;; - esac - - _LT_PROG_LTMAIN - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - _LT_PROG_XSI_SHELLFNS - - sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ - || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -], -[cat <<_LT_EOF >> "$ofile" - -dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -dnl in a comment (ie after a #). -# ### BEGIN LIBTOOL TAG CONFIG: $1 -_LT_LIBTOOL_TAG_VARS(_LT_TAG) -# ### END LIBTOOL TAG CONFIG: $1 -_LT_EOF -])dnl /m4_if -], -[m4_if([$1], [], [ - PACKAGE='$PACKAGE' - VERSION='$VERSION' - TIMESTAMP='$TIMESTAMP' - RM='$RM' - ofile='$ofile'], []) -])dnl /_LT_CONFIG_SAVE_COMMANDS -])# _LT_CONFIG - - -# LT_SUPPORTED_TAG(TAG) -# --------------------- -# Trace this macro to discover what tags are supported by the libtool -# --tag option, using: -# autoconf --trace 'LT_SUPPORTED_TAG:$1' -AC_DEFUN([LT_SUPPORTED_TAG], []) - - -# C support is built-in for now -m4_define([_LT_LANG_C_enabled], []) -m4_define([_LT_TAGS], []) - - -# LT_LANG(LANG) -# ------------- -# Enable libtool support for the given language if not already enabled. -AC_DEFUN([LT_LANG], -[AC_BEFORE([$0], [LT_OUTPUT])dnl -m4_case([$1], - [C], [_LT_LANG(C)], - [C++], [_LT_LANG(CXX)], - [Java], [_LT_LANG(GCJ)], - [Fortran 77], [_LT_LANG(F77)], - [Fortran], [_LT_LANG(FC)], - [Windows Resource], [_LT_LANG(RC)], - [m4_ifdef([_LT_LANG_]$1[_CONFIG], - [_LT_LANG($1)], - [m4_fatal([$0: unsupported language: "$1"])])])dnl -])# LT_LANG - - -# _LT_LANG(LANGNAME) -# ------------------ -m4_defun([_LT_LANG], -[m4_ifdef([_LT_LANG_]$1[_enabled], [], - [LT_SUPPORTED_TAG([$1])dnl - m4_append([_LT_TAGS], [$1 ])dnl - m4_define([_LT_LANG_]$1[_enabled], [])dnl - _LT_LANG_$1_CONFIG($1)])dnl -])# _LT_LANG - - -# _LT_LANG_DEFAULT_CONFIG -# ----------------------- -m4_defun([_LT_LANG_DEFAULT_CONFIG], -[AC_PROVIDE_IFELSE([AC_PROG_CXX], - [LT_LANG(CXX)], - [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) - -AC_PROVIDE_IFELSE([AC_PROG_F77], - [LT_LANG(F77)], - [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) - -AC_PROVIDE_IFELSE([AC_PROG_FC], - [LT_LANG(FC)], - [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) - -dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -dnl pulling things in needlessly. -AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [LT_LANG(GCJ)], - [AC_PROVIDE_IFELSE([LT_PROG_GCJ], - [LT_LANG(GCJ)], - [m4_ifdef([AC_PROG_GCJ], - [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([A][M_PROG_GCJ], - [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) - m4_ifdef([LT_PROG_GCJ], - [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) - -AC_PROVIDE_IFELSE([LT_PROG_RC], - [LT_LANG(RC)], - [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -])# _LT_LANG_DEFAULT_CONFIG - -# Obsolete macros: -AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -dnl aclocal-1.4 backwards compatibility: -dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -dnl AC_DEFUN([AC_LIBTOOL_F77], []) -dnl AC_DEFUN([AC_LIBTOOL_FC], []) -dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) - - -# _LT_TAG_COMPILER -# ---------------- -m4_defun([_LT_TAG_COMPILER], +AC_DEFUN([_LT_AC_SYS_COMPILER], [AC_REQUIRE([AC_PROG_CC])dnl -_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl - # If no C compiler was specified, use CC. LTCC=${LTCC-"$CC"} @@ -863,20 +239,35 @@ # Allow CC to be a program name with arguments. compiler=$CC -])# _LT_TAG_COMPILER +])# _LT_AC_SYS_COMPILER +# _LT_CC_BASENAME(CC) +# ------------------- +# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. +AC_DEFUN([_LT_CC_BASENAME], +[for cc_temp in $1""; do + case $cc_temp in + compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; + distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` +]) + + # _LT_COMPILER_BOILERPLATE # ------------------------ # Check for compiler boilerplate output or warnings with # the simple compiler test code. -m4_defun([_LT_COMPILER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_compile_test_code" >conftest.$ac_ext +AC_DEFUN([_LT_COMPILER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_compile_test_code" >conftest.$ac_ext eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_compiler_boilerplate=`cat conftest.err` -$RM conftest* +$rm conftest* ])# _LT_COMPILER_BOILERPLATE @@ -884,203 +275,70 @@ # ---------------------- # Check for linker boilerplate output or warnings with # the simple link test code. -m4_defun([_LT_LINKER_BOILERPLATE], -[m4_require([_LT_DECL_SED])dnl -ac_outfile=conftest.$ac_objext -echo "$lt_simple_link_test_code" >conftest.$ac_ext +AC_DEFUN([_LT_LINKER_BOILERPLATE], +[ac_outfile=conftest.$ac_objext +printf "$lt_simple_link_test_code" >conftest.$ac_ext eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err _lt_linker_boilerplate=`cat conftest.err` -$RM -r conftest* +$rm conftest* ])# _LT_LINKER_BOILERPLATE -# _LT_REQUIRED_DARWIN_CHECKS -# ------------------------- -m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ - case $host_os in - rhapsody* | darwin*) - AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) - AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) - AC_CHECK_TOOL([LIPO], [lipo], [:]) - AC_CHECK_TOOL([OTOOL], [otool], [:]) - AC_CHECK_TOOL([OTOOL64], [otool64], [:]) - _LT_DECL([], [DSYMUTIL], [1], - [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) - _LT_DECL([], [NMEDIT], [1], - [Tool to change global to local symbols on Mac OS X]) - _LT_DECL([], [LIPO], [1], - [Tool to manipulate fat objects and archives on Mac OS X]) - _LT_DECL([], [OTOOL], [1], - [ldd/readelf like tool for Mach-O binaries on Mac OS X]) - _LT_DECL([], [OTOOL64], [1], - [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) - AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], - [lt_cv_apple_cc_single_mod=no - if test -z "${LT_MULTI_MODULE}"; then - # By default we will add the -single_module flag. You can override - # by either setting the environment variable LT_MULTI_MODULE - # non-empty at configure time, or by adding -multi_module to the - # link flags. - rm -rf libconftest.dylib* - echo "int foo(void){return 1;}" > conftest.c - echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ --dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD - $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ - -dynamiclib -Wl,-single_module conftest.c 2>conftest.err - _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then - lt_cv_apple_cc_single_mod=yes - else - cat conftest.err >&AS_MESSAGE_LOG_FD - fi - rm -rf libconftest.dylib* - rm -f conftest.* - fi]) - AC_CACHE_CHECK([for -exported_symbols_list linker flag], - [lt_cv_ld_exported_symbols_list], - [lt_cv_ld_exported_symbols_list=no - save_LDFLAGS=$LDFLAGS - echo "_main" > conftest.sym - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], - [lt_cv_ld_exported_symbols_list=yes], - [lt_cv_ld_exported_symbols_list=no]) - LDFLAGS="$save_LDFLAGS" - ]) - case $host_os in - rhapsody* | darwin1.[[012]]) - _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; - darwin1.*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - 10.[[012]]*) - _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; - esac - ;; - esac - if test "$lt_cv_apple_cc_single_mod" = "yes"; then - _lt_dar_single_mod='$single_module' - fi - if test "$lt_cv_ld_exported_symbols_list" = "yes"; then - _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' - else - _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' - fi - if test "$DSYMUTIL" != ":"; then - _lt_dsymutil='~$DSYMUTIL $lib || :' - else - _lt_dsymutil= - fi - ;; - esac -]) - - -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- -# Checks for linker and compiler features on darwin -m4_defun([_LT_DARWIN_LINKER_FEATURES], -[ - m4_require([_LT_REQUIRED_DARWIN_CHECKS]) - _LT_TAGVAR(archive_cmds_need_lc, $1)=no - _LT_TAGVAR(hardcode_direct, $1)=no - _LT_TAGVAR(hardcode_automatic, $1)=yes - _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_TAGVAR(whole_archive_flag_spec, $1)='' - _LT_TAGVAR(link_all_deplibs, $1)=yes - _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" - case $cc_basename in - ifort*) _lt_dar_can_shared=yes ;; - *) _lt_dar_can_shared=$GCC ;; - esac - if test "$_lt_dar_can_shared" = "yes"; then - output_verbose_link_cmd=echo - _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" - _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" - m4_if([$1], [CXX], -[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then - _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" - fi -],[]) - else - _LT_TAGVAR(ld_shlibs, $1)=no - fi -]) - -# _LT_SYS_MODULE_PATH_AIX -# ----------------------- +# _LT_AC_SYS_LIBPATH_AIX +# ---------------------- # Links a minimal program and checks the executable # for the system default hardcoded library path. In most cases, # this is /usr/lib:/lib, but when the MPI compilers are used # the location of the communication and MPI libs are included too. # If we don't find anything, use the default library path according # to the aix ld manual. -m4_defun([_LT_SYS_MODULE_PATH_AIX], -[m4_require([_LT_DECL_SED])dnl -AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { - /^0/ { - s/^0 *$.*$$/\1/ - p - } - }' -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` +AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], +[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; } +}'` # Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then - aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -fi],[]) +if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *$.*$$/\1/; p; } +}'`; fi],[]) if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_SYS_MODULE_PATH_AIX +])# _LT_AC_SYS_LIBPATH_AIX -# _LT_SHELL_INIT(ARG) -# ------------------- -m4_define([_LT_SHELL_INIT], +# _LT_AC_SHELL_INIT(ARG) +# ---------------------- +AC_DEFUN([_LT_AC_SHELL_INIT], [ifdef([AC_DIVERSION_NOTICE], [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], [AC_DIVERT_PUSH(NOTICE)]) $1 AC_DIVERT_POP -])# _LT_SHELL_INIT +])# _LT_AC_SHELL_INIT -# _LT_PROG_ECHO_BACKSLASH -# ----------------------- +# _LT_AC_PROG_ECHO_BACKSLASH +# -------------------------- # Add some code to the start of the generated configure script which # will find an echo command which doesn't interpret backslashes. -m4_defun([_LT_PROG_ECHO_BACKSLASH], -[_LT_SHELL_INIT([ +AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], +[_LT_AC_SHELL_INIT([ # Check that we are running under the correct shell. SHELL=${CONFIG_SHELL-/bin/sh} -case X$lt_ECHO in +case X$ECHO in X*--fallback-echo) # Remove one level of quotation (which was required for Make). - ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` + ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ;; esac -ECHO=${lt_ECHO-echo} +echo=${ECHO-echo} if test "X[$]1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. shift elif test "X[$]1" = X--fallback-echo; then # Avoid inline document here, it may be left over : -elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then - # Yippee, $ECHO works! +elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then + # Yippee, $echo works! : else # Restart under the correct shell. @@ -1090,9 +348,9 @@ if test "X[$]1" = X--fallback-echo; then # used as fallback echo shift - cat <<_LT_EOF + cat <<EOF [$]* -_LT_EOF +EOF exit 0 fi @@ -1100,127 +358,124 @@ # if CDPATH is set. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -if test -z "$lt_ECHO"; then - if test "X${echo_test_string+set}" != Xset; then - # find a string as large as possible, as long as the shell can cope with it - for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do - # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... - if { echo_test_string=`eval $cmd`; } 2>/dev/null && - { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null - then - break - fi - done - fi +if test -z "$ECHO"; then +if test "X${echo_test_string+set}" != Xset; then +# find a string as large as possible, as long as the shell can cope with it + for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do + # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... + if (echo_test_string=`eval $cmd`) 2>/dev/null && + echo_test_string=`eval $cmd` && + (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null + then + break + fi + done +fi - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : - else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. +if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + : +else + # The Solaris, AIX, and Digital Unix default echo programs unquote + # backslashes. This makes it impossible to quote backslashes using + # echo "$something" | sed 's/\\/\\\\/g' + # + # So, first we look for a working echo in the user's PATH. - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$dir/echo" - break - fi - done + lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR + for dir in $PATH /usr/ucb; do IFS="$lt_save_ifs" + if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && + test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$dir/echo" + break + fi + done + IFS="$lt_save_ifs" - if test "X$ECHO" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - ECHO='print -r' - elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - ECHO='printf %s\n' - if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && - echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && + if test "X$echo" = Xecho; then + # We didn't find a better echo, so look for alternatives. + if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # This shell has a builtin print -r that does the trick. + echo='print -r' + elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && + test "X$CONFIG_SHELL" != X/bin/ksh; then + # If we have ksh, try running configure again with it. + ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} + export ORIGINAL_CONFIG_SHELL + CONFIG_SHELL=/bin/ksh + export CONFIG_SHELL + exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} + else + # Try using printf. + echo='printf %s\n' + if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && + echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + # Cool, printf works + : + elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - ECHO="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: + CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL + export CONFIG_SHELL + SHELL="$CONFIG_SHELL" + export SHELL + echo="$CONFIG_SHELL [$]0 --fallback-echo" + elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && + test "X$echo_testing_string" = 'X\t' && + echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && + test "X$echo_testing_string" = "X$echo_test_string"; then + echo="$CONFIG_SHELL [$]0 --fallback-echo" + else + # maybe with a smaller string... + prev=: - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - ECHO=echo + for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do + if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null + then + break fi - fi + prev="$cmd" + done + + if test "$prev" != 'sed 50q "[$]0"'; then + echo_test_string=`eval $prev` + export echo_test_string + exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} + else + # Oops. We lost completely, so just stick with echo. + echo=echo + fi fi fi fi fi +fi # Copy echo and quote the copy suitably for passing to libtool from # the Makefile, instead of quoting the original, which is used later. -lt_ECHO=$ECHO -if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" +ECHO=$echo +if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then + ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" fi -AC_SUBST(lt_ECHO) -]) -_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -_LT_DECL([], [ECHO], [1], @@ Diff output truncated at 50000 characters. @@

1 0

[commit][3270] slash backslash
by commits＠squeakvm.org 12 Mar '15

12 Mar '15

Revision: 3270 Author: eliot Date: 2015-03-12 12:29:31 -0700 (Thu, 12 Mar 2015) Log Message: ----------- slash backslash Modified Paths: -------------- branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/plugins/GdbARMPlugin/acinclude.m4 Modified: branches/Cog/platforms/unix/config/configure =================================================================== --- branches/Cog/platforms/unix/config/configure 2015-03-12 19:14:07 UTC (rev 3269) +++ branches/Cog/platforms/unix/config/configure 2015-03-12 19:29:31 UTC (rev 3270) @@ -20714,9 +20714,9 @@ rm -f GdbARMPlugin.sub GdbARMPlugin.lib # To build the GdbARMPlugin one must build libsim.a from gdb if test -f ../../../processors/ARM/gdb-7.6/sim/arm/libsim.a; then - echo "libsim.a has been built\; building GdbARMPlugin" + echo "libsim.a has been built; building GdbARMPlugin" else - echo "/processors/ARM/gdb-7.6/sim/arm/libsim.a has not been built\; not building GdbARMPlugin" + echo "/processors/ARM/gdb-7.6/sim/arm/libsim.a has not been built; not building GdbARMPlugin" { $as_echo "$as_me:$LINENO: result: ******** disabling ${plugin}" >&5 Modified: branches/Cog/platforms/unix/plugins/GdbARMPlugin/acinclude.m4 =================================================================== --- branches/Cog/platforms/unix/plugins/GdbARMPlugin/acinclude.m4 2015-03-12 19:14:07 UTC (rev 3269) +++ branches/Cog/platforms/unix/plugins/GdbARMPlugin/acinclude.m4 2015-03-12 19:29:31 UTC (rev 3270) @@ -1,7 +1,7 @@ # To build the GdbARMPlugin one must build libsim.a from gdb if test -f ../../../processors/ARM/gdb-7.6/sim/arm/libsim.a; then - echo "libsim.a has been built\; building GdbARMPlugin" + echo "libsim.a has been built; building GdbARMPlugin" else - echo "/processors/ARM/gdb-7.6/sim/arm/libsim.a has not been built\; not building GdbARMPlugin" + echo "/processors/ARM/gdb-7.6/sim/arm/libsim.a has not been built; not building GdbARMPlugin" AC_PLUGIN_DISABLE fi

1 0

[commit][3269] Update unix configuration to expect gdb-7. 6 ARM support to be build in
by commits＠squeakvm.org 12 Mar '15

12 Mar '15

Revision: 3269 Author: eliot Date: 2015-03-12 12:14:07 -0700 (Thu, 12 Mar 2015) Log Message: ----------- Update unix configuration to expect gdb-7.6 ARM support to be build in processors/ARM/gdb-7.6. Add platforms/unix/plugins/GdbARMPlugin/acinclude.m4 to only attempt to build ARM plugin if libsim.a has been built in the expected place. Add GdbARMPlugin to the linux cog spur builds. Slight speedup to unix builds by make install-squeak install-plugins, excluding install-doc which is part of the default make install. Modified Paths: -------------- branches/Cog/build.linux32ARM/squeak.stack.spur/build/mvm branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/mvm branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/mvm branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.cog.v3/build/mvm branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/mvm branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/mvm branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/mvm branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build/plugins.ext branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/plugins.ext branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/plugins.ext branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/plugins.ext branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/plugins.ext branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/plugins.ext branches/Cog/build.linux32x86/squeak.cog.v3/build/mvm branches/Cog/build.linux32x86/squeak.cog.v3/build.assert/mvm branches/Cog/build.linux32x86/squeak.cog.v3/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.cog.v3/build.debug/mvm branches/Cog/build.linux32x86/squeak.cog.v3/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.cog.v3/build.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded/mvm branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.assert/mvm branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.debug/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm branches/Cog/build.linux32x86/squeak.stack.v3/build/mvm branches/Cog/build.linux32x86/squeak.stack.v3/build.assert/mvm branches/Cog/build.linux32x86/squeak.stack.v3/build.debug/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux64x64/newspeak.stack.spur/build/mvm branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert/mvm branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug/mvm branches/Cog/build.linux64x64/squeak.cog.spur/build/mvm branches/Cog/build.linux64x64/squeak.cog.spur/build.assert/mvm branches/Cog/build.linux64x64/squeak.cog.spur/build.assert.itimerheartbeat/mvm branches/Cog/build.linux64x64/squeak.cog.spur/build.debug/mvm branches/Cog/build.linux64x64/squeak.cog.spur/build.debug.itimerheartbeat/mvm branches/Cog/build.linux64x64/squeak.cog.spur/build.itimerheartbeat/mvm branches/Cog/build.linux64x64/squeak.stack.spur/build/mvm branches/Cog/build.linux64x64/squeak.stack.spur/build.assert/mvm branches/Cog/build.linux64x64/squeak.stack.spur/build.debug/mvm branches/Cog/platforms/unix/config/aclocal.m4 branches/Cog/platforms/unix/config/configure branches/Cog/platforms/unix/plugins/GdbARMPlugin/Makefile.inc Added Paths: ----------- branches/Cog/platforms/unix/plugins/GdbARMPlugin/acinclude.m4 Property Changed: ---------------- branches/Cog/platforms/Cross/vm/sqSCCSVersion.h Modified: branches/Cog/build.linux32ARM/squeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32ARM/squeak.stack.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -30,4 +30,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32ARM/squeak.stack.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -26,4 +26,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32ARM/squeak.stack.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -26,4 +26,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm =================================================================== --- branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32ARM/squeak.stack.v3/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag and Raspbian lacks `readlinks` -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -33,5 +33,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,5 +29,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,5 +27,5 @@ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,5 +29,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,5 +27,5 @@ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.spur/build.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -31,5 +31,5 @@ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -31,5 +31,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,5 +27,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.assert.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,5 +27,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,5 +27,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.debug.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,5 +27,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.cog.v3/build.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -31,5 +31,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -33,5 +33,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,5 +29,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/newspeak.stack.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,5 +29,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,4 +29,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build/plugins.ext =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build/plugins.ext 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build/plugins.ext 2015-03-12 19:14:07 UTC (rev 3269) @@ -2,6 +2,7 @@ EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ BochsIA32Plugin \ +GdbARMPlugin \ SqueakFFIPrims \ SqueakSSL \ LocalePlugin \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/plugins.ext =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/plugins.ext 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert/plugins.ext 2015-03-12 19:14:07 UTC (rev 3269) @@ -2,6 +2,7 @@ EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ BochsIA32Plugin \ +GdbARMPlugin \ SqueakFFIPrims \ SqueakSSL \ LocalePlugin \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/plugins.ext =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/plugins.ext 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.assert.itimerheartbeat/plugins.ext 2015-03-12 19:14:07 UTC (rev 3269) @@ -2,6 +2,7 @@ EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ BochsIA32Plugin \ +GdbARMPlugin \ SqueakFFIPrims \ SqueakSSL \ LocalePlugin \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/plugins.ext =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/plugins.ext 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug/plugins.ext 2015-03-12 19:14:07 UTC (rev 3269) @@ -2,6 +2,7 @@ EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ BochsIA32Plugin \ +GdbARMPlugin \ SqueakFFIPrims \ SqueakSSL \ LocalePlugin \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/plugins.ext =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/plugins.ext 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.debug.itimerheartbeat/plugins.ext 2015-03-12 19:14:07 UTC (rev 3269) @@ -2,6 +2,7 @@ EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ BochsIA32Plugin \ +GdbARMPlugin \ SqueakFFIPrims \ SqueakSSL \ LocalePlugin \ Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,4 +29,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/plugins.ext =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/plugins.ext 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.spur/build.itimerheartbeat/plugins.ext 2015-03-12 19:14:07 UTC (rev 3269) @@ -2,6 +2,7 @@ EXTERNAL_PLUGINS = \ B3DAcceleratorPlugin \ BochsIA32Plugin \ +GdbARMPlugin \ SqueakFFIPrims \ SqueakSSL \ LocalePlugin \ Modified: branches/Cog/build.linux32x86/squeak.cog.v3/build/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.v3/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,4 +27,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.v3/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.v3/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -23,4 +23,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.v3/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/build.assert.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.v3/build.assert.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -23,4 +23,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.v3/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.v3/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -23,4 +23,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.v3/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/build.debug.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.v3/build.debug.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -23,4 +23,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.v3/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/build.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.v3/build.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,4 +27,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -28,4 +28,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -24,4 +24,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.cog.v3/build.multithreaded.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -24,4 +24,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,4 +29,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.assert.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.debug.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.sista.spur/build.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,4 +29,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.stack.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,4 +29,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.stack.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -26,4 +26,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.stack.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -26,4 +26,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.stack.v3/build/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.v3/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.stack.v3/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,4 +29,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.stack.v3/build.assert/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.v3/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.stack.v3/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux32x86/squeak.stack.v3/build.debug/mvm =================================================================== --- branches/Cog/build.linux32x86/squeak.stack.v3/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux32x86/squeak.stack.v3/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -33,5 +33,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,5 +29,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,5 +27,5 @@ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,5 +29,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -27,5 +27,5 @@ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/newspeak.cog.spur/build.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -31,5 +31,5 @@ LDFLAGS=-Wl,-z,now rm -f vm/sqUnixMain.o # nuke version info rm -rf ../../../products/$INSTALLDIR -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux64x64/newspeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.stack.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/newspeak.stack.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -33,5 +33,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/newspeak.stack.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,5 +29,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/newspeak.stack.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,5 +29,5 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG ../../editnewspeakinstall.sh ../../../products/$INSTALLDIR "$@" Modified: branches/Cog/build.linux64x64/squeak.cog.spur/build/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.cog.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/squeak.cog.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,4 +29,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux64x64/squeak.cog.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.cog.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/squeak.cog.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux64x64/squeak.cog.spur/build.assert.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/squeak.cog.spur/build.assert.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux64x64/squeak.cog.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.cog.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/squeak.cog.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux64x64/squeak.cog.spur/build.debug.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/squeak.cog.spur/build.debug.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -25,4 +25,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux64x64/squeak.cog.spur/build.itimerheartbeat/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.cog.spur/build.itimerheartbeat/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/squeak.cog.spur/build.itimerheartbeat/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,4 +29,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux64x64/squeak.stack.spur/build/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.stack.spur/build/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/squeak.stack.spur/build/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -29,4 +29,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux64x64/squeak.stack.spur/build.assert/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.stack.spur/build.assert/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/squeak.stack.spur/build.assert/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -26,4 +26,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Modified: branches/Cog/build.linux64x64/squeak.stack.spur/build.debug/mvm =================================================================== --- branches/Cog/build.linux64x64/squeak.stack.spur/build.debug/mvm 2015-03-12 03:53:41 UTC (rev 3268) +++ branches/Cog/build.linux64x64/squeak.stack.spur/build.debug/mvm 2015-03-12 19:14:07 UTC (rev 3269) @@ -26,4 +26,4 @@ rm -rf ../../../products/$INSTALLDIR # prefer make install prefix=`readlink -f \`pwd\`/../../../products/$INSTALLDIR` # but older linux readlinks lack the -f flag -make install prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG +make install-squeak install-plugins prefix=`(cd ../../../;pwd)`/products/$INSTALLDIR 2>&1 | tee LOG Property changes on: branches/Cog/platforms/Cross/vm/sqSCCSVersion.h ___________________________________________________________________ @@ Diff output truncated at 50000 characters. @@

1 0

VMMaker-tfel.358 in Inbox: Fixes for BitBlt simulation
by timfelgentreff 12 Mar '15

12 Mar '15

Hi, I've pushed a change to the BitBlt simulation code to the Inbox (VMMaker-tfel.358), because I didn't know where else to put it. With these changes, we are able to run a current 4.5 image with VMMaker loaded on our RSqueakVM, with BitBlt entirely run from within the image. The goal is to have the VM run as many plugins as possible from pure Smalltalk, so there will be more slight changes and maybe the odd performance improvement for the simulation forthcoming. Is this something that would be ok with everyone? Here's the diff: BitBltSimulation>>loadColorMap: (changed) loadColorMap "ColorMap, if not nil, must be longWords, and 2^N long, where N = sourceDepth for 1, 2, 4, 8 bits, or N = 9, 12, or 15 (3, 4, 5 bits per color) for 16 or 32 bits." | cmSize oldStyle oop cmOop | <inline: true> cmFlags := cmMask := cmBitsPerColor := 0. cmShiftTable := nil. cmMaskTable := nil. cmLookupTable := nil. cmOop := interpreterProxy fetchPointer: BBColorMapIndex ofObject: bitBltOop. cmOop = interpreterProxy nilObject ifTrue: [^ true]. cmFlags := ColorMapPresent. "even if identity or somesuch - may be cleared later" oldStyle := false. (interpreterProxy isWords: cmOop) ifTrue: ["This is an old-style color map (indexed only, with implicit RGBA conversion)" cmSize := interpreterProxy slotSizeOf: cmOop. cmLookupTable := interpreterProxy firstIndexableField: cmOop. - oldStyle := true. - self - cCode: '' - inSmalltalk: [self assert: cmLookupTable unitSize = 4]] + oldStyle := true] ifFalse: ["A new-style color map (fully qualified)" ((interpreterProxy isPointers: cmOop) and: [(interpreterProxy slotSizeOf: cmOop) >= 3]) ifFalse: [^ false]. cmShiftTable := self loadColorMapShiftOrMaskFrom: (interpreterProxy fetchPointer: 0 ofObject: cmOop). cmMaskTable := self loadColorMapShiftOrMaskFrom: (interpreterProxy fetchPointer: 1 ofObject: cmOop). oop := interpreterProxy fetchPointer: 2 ofObject: cmOop. oop = interpreterProxy nilObject ifTrue: [cmSize := 0] ifFalse: [(interpreterProxy isWords: oop) ifFalse: [^ false]. cmSize := interpreterProxy slotSizeOf: oop. cmLookupTable := interpreterProxy firstIndexableField: oop]. cmFlags := cmFlags bitOr: ColorMapNewStyle. self cCode: '' inSmalltalk: [self assert: cmShiftTable unitSize = 4. self assert: cmMaskTable unitSize = 4. self assert: cmLookupTable unitSize = 4]]. (cmSize bitAnd: cmSize - 1) = 0 ifFalse: [^ false]. cmMask := cmSize - 1. cmBitsPerColor := 0. cmSize = 512 ifTrue: [cmBitsPerColor := 3]. cmSize = 4096 ifTrue: [cmBitsPerColor := 4]. cmSize = 32768 ifTrue: [cmBitsPerColor := 5]. cmSize = 0 ifTrue: [cmLookupTable := nil. cmMask := 0] ifFalse: [cmFlags := cmFlags bitOr: ColorMapIndexedPart]. oldStyle ifTrue: ["needs implicit conversion" self setupColorMasks]. "Check if colorMap is just identity mapping for RGBA parts" (self isIdentityMap: cmShiftTable with: cmMaskTable) ifTrue: [cmMaskTable := nil. cmShiftTable := nil] ifFalse: [cmFlags := cmFlags bitOr: ColorMapFixedPart]. ^ true BitBltSimulator>>halftoneAt: (added) +halftoneAt: idx + ^ halftoneBase + (idx \\ halftoneHeight * 4) long32At: 0 -- View this message in context: http://forum.world.st/VMMaker-tfel-358-in-Inbox-Fixes-for-BitBlt-simulation… Sent from the Squeak VM mailing list archive at Nabble.com.

2 5

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

Vm-dev March 2015