Minor tweaks to shorten method names.
authorJan Vrany <jan.vrany@fit.cvut.cz>
Thu, 16 Aug 2018 14:10:06 +0100
changeset 49 704b049b9aa2
parent 48 d55d740fb1fc
child 50 7f439240d923
Minor tweaks to shorten method names.
udis86sx/Make.proto
udis86sx/UDIS86Instruction.st
udis86sx/UDIS86Mnemonics.st
udis86sx/bc.mak
--- a/udis86sx/Make.proto	Mon Jun 25 15:45:17 2018 +0100
+++ b/udis86sx/Make.proto	Thu Aug 16 14:10:06 2018 +0100
@@ -138,7 +138,7 @@
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)UDIS86.$(O) UDIS86.$(C) UDIS86.$(H): UDIS86.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
 $(OUTDIR)UDIS86Mnemonics.$(O) UDIS86Mnemonics.$(C) UDIS86Mnemonics.$(H): UDIS86Mnemonics.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(STCHDR)
-$(OUTDIR)UDIS86Operand.$(O) UDIS86Operand.$(C) UDIS86Operand.$(H): UDIS86Operand.st $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/ByteArray.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(STCHDR)
+$(OUTDIR)UDIS86Operand.$(O) UDIS86Operand.$(C) UDIS86Operand.$(H): UDIS86Operand.st $(INCLUDE_TOP)/stx/libbasic/ArrayedCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/Collection.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SequenceableCollection.$(H) $(INCLUDE_TOP)/stx/libbasic/UninterpretedBytes.$(H) $(STCHDR)
 $(OUTDIR)UDIS86Types.$(O) UDIS86Types.$(C) UDIS86Types.$(H): UDIS86Types.st $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/SharedPool.$(H) $(STCHDR)
 $(OUTDIR)jv_dragonfly_udis86sx.$(O) jv_dragonfly_udis86sx.$(C) jv_dragonfly_udis86sx.$(H): jv_dragonfly_udis86sx.st $(INCLUDE_TOP)/stx/libbasic/LibraryDefinition.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(INCLUDE_TOP)/stx/libbasic/ProjectDefinition.$(H) $(STCHDR)
 $(OUTDIR)UDIS86Instruction.$(O) UDIS86Instruction.$(C) UDIS86Instruction.$(H): UDIS86Instruction.st $(INCLUDE_TOP)/jv/dragonfly/udis86sx/UDIS86Mnemonics.$(H) $(INCLUDE_TOP)/jv/dragonfly/udis86sx/UDIS86Types.$(H) $(INCLUDE_TOP)/stx/libbasic/Object.$(H) $(STCHDR)
--- a/udis86sx/UDIS86Instruction.st	Mon Jun 25 15:45:17 2018 +0100
+++ b/udis86sx/UDIS86Instruction.st	Thu Aug 16 14:10:06 2018 +0100
@@ -79,20 +79,27 @@
     ^ assembly
 !
 
-branchTargetAddress
-    "
-    Return and address of next instruction if branch is taken.
-    Assumes that this instruction is a branch instruction.
+branchTarget
     "
-    self assert: self isBranchInstruction.
-    self assert: operand0 notNil.
-    self assert: operand0 type = UD_OP_JIMM.
-
+     Return and address of next instruction if branch is taken.
+     Assumes that this instruction is a branch instruction."
+    
+    self assert:self isBranch.
+    self assert:operand0 notNil.
+    self assert:operand0 type = UD_OP_JIMM.
     ^ pc + len + operand0 sval.
 
     "Created: / 26-06-2018 / 11:38:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!UDIS86Instruction methodsFor:'enumerating'!
+
+instructionsDo: aBlock
+    aBlock value: self.
+
+    "Created: / 16-08-2018 / 16:15:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !UDIS86Instruction methodsFor:'initialization'!
 
 setAssembly: aString
@@ -149,22 +156,22 @@
 
 !UDIS86Instruction methodsFor:'testing'!
 
-isBranchInstruction
+isBranch
     "
-    Return `true` is this instruction is some sort of branch instruction.
-    "    
-    ^ mnemonic between: UD_Ijo and: UD_Ijmp
+     Return `true` is this instruction is some sort of branch instruction."
+    
+    ^ mnemonic between:UD_Ijo and:UD_Ijmp
 
     "Created: / 26-06-2018 / 11:35:57 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-isReturnInstruction
-    "
-    Return `true` is this instruction is a return
-    "    
-    ^ mnemonic between: UD_Iret and: UD_Iretf
+isReturn
+    "Return `true` is this instruction is a return"
+    
+    ^ mnemonic between:UD_Iret and:UD_Iretf
 
     "Created: / 26-06-2018 / 15:39:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified (comment): / 16-08-2018 / 14:02:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
 !UDIS86Instruction class methodsFor:'documentation'!
--- a/udis86sx/UDIS86Mnemonics.st	Mon Jun 25 15:45:17 2018 +0100
+++ b/udis86sx/UDIS86Mnemonics.st	Thu Aug 16 14:10:06 2018 +0100
@@ -2795,5 +2795,12 @@
     
 ! !
 
+!UDIS86Mnemonics class methodsFor:'documentation'!
+
+version_HG
+
+    ^ '$Changeset: <not expanded> $'
+! !
+
 
 UDIS86Mnemonics initialize!
--- a/udis86sx/bc.mak	Mon Jun 25 15:45:17 2018 +0100
+++ b/udis86sx/bc.mak	Thu Aug 16 14:10:06 2018 +0100
@@ -85,7 +85,7 @@
 # BEGINMAKEDEPEND --- do not remove this line; make depend needs it
 $(OUTDIR)UDIS86.$(O) UDIS86.$(C) UDIS86.$(H): UDIS86.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)
 $(OUTDIR)UDIS86Mnemonics.$(O) UDIS86Mnemonics.$(C) UDIS86Mnemonics.$(H): UDIS86Mnemonics.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(STCHDR)
-$(OUTDIR)UDIS86Operand.$(O) UDIS86Operand.$(C) UDIS86Operand.$(H): UDIS86Operand.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\ByteArray.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(STCHDR)
+$(OUTDIR)UDIS86Operand.$(O) UDIS86Operand.$(C) UDIS86Operand.$(H): UDIS86Operand.st $(INCLUDE_TOP)\stx\libbasic\ArrayedCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\Collection.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SequenceableCollection.$(H) $(INCLUDE_TOP)\stx\libbasic\UninterpretedBytes.$(H) $(STCHDR)
 $(OUTDIR)UDIS86Types.$(O) UDIS86Types.$(C) UDIS86Types.$(H): UDIS86Types.st $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\SharedPool.$(H) $(STCHDR)
 $(OUTDIR)jv_dragonfly_udis86sx.$(O) jv_dragonfly_udis86sx.$(C) jv_dragonfly_udis86sx.$(H): jv_dragonfly_udis86sx.st $(INCLUDE_TOP)\stx\libbasic\LibraryDefinition.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(INCLUDE_TOP)\stx\libbasic\ProjectDefinition.$(H) $(STCHDR)
 $(OUTDIR)UDIS86Instruction.$(O) UDIS86Instruction.$(C) UDIS86Instruction.$(H): UDIS86Instruction.st $(INCLUDE_TOP)\jv\dragonfly\udis86sx\UDIS86Mnemonics.$(H) $(INCLUDE_TOP)\jv\dragonfly\udis86sx\UDIS86Types.$(H) $(INCLUDE_TOP)\stx\libbasic\Object.$(H) $(STCHDR)