Mercurial > lcfOS
comparison python/ppci/transform.py @ 336:d1ecc493384e
Added spiffy armtoken class for bit fiddeling. Added cool test that checks for build repeatability
| author | Windel Bouwman |
|---|---|
| date | Wed, 19 Feb 2014 22:32:15 +0100 |
| parents | 6f4753202b9a |
| children | c2ddc8a36f5e |
comparison
equal
deleted
inserted
replaced
| 335:582a1aaa3983 | 336:d1ecc493384e |
|---|---|
| 155 self.glue_blocks(preds[0], block, f) | 155 self.glue_blocks(preds[0], block, f) |
| 156 change = True | 156 change = True |
| 157 | 157 |
| 158 def glue_blocks(self, block1, block2, f): | 158 def glue_blocks(self, block1, block2, f): |
| 159 """ Glue two blocks together into the first block """ | 159 """ Glue two blocks together into the first block """ |
| 160 self.logger.debug('Glueing {} and {}'.format(block1, block2)) | 160 self.logger.debug('Merging {} and {}'.format(block1.name, block2.name)) |
| 161 | 161 |
| 162 # Remove the last jump: | 162 # Remove the last jump: |
| 163 block1.removeInstruction(block1.LastInstruction) | 163 block1.removeInstruction(block1.LastInstruction) |
| 164 | 164 |
| 165 # Copy all instructions to block1: | 165 # Copy all instructions to block1: |