diff options
author | Amaury Pouly <amaury.pouly@gmail.com> | 2013-08-06 15:47:35 +0200 |
---|---|---|
committer | Amaury Pouly <amaury.pouly@gmail.com> | 2013-08-06 21:24:38 +0200 |
commit | 97459def3c34d338d3ced9bd2b55f8902573aa19 (patch) | |
tree | 08cd8ee128334c4ae40e7adfc382662ae8d4a32b /utils/imxtools/sbtools/sb.c | |
parent | 8b13d2f5f100d088746a1f8dd94f8ab82acc9b5b (diff) | |
download | rockbox-97459def3c34d338d3ced9bd2b55f8902573aa19.tar.gz rockbox-97459def3c34d338d3ced9bd2b55f8902573aa19.zip |
sbtools: fix handling of NOP instructions
Change-Id: I05ab8176f368a6e2d075dfb2059692871e0c00b3
Diffstat (limited to 'utils/imxtools/sbtools/sb.c')
-rw-r--r-- | utils/imxtools/sbtools/sb.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/utils/imxtools/sbtools/sb.c b/utils/imxtools/sbtools/sb.c index 05f9836b46..df3622940f 100644 --- a/utils/imxtools/sbtools/sb.c +++ b/utils/imxtools/sbtools/sb.c | |||
@@ -122,6 +122,13 @@ static void compute_sb_offsets(struct sb_file_t *sb) | |||
122 | sb->image_size += ROUND_UP(inst->size, BLOCK_SIZE) / BLOCK_SIZE; | 122 | sb->image_size += ROUND_UP(inst->size, BLOCK_SIZE) / BLOCK_SIZE; |
123 | sec->sec_size += ROUND_UP(inst->size, BLOCK_SIZE) / BLOCK_SIZE; | 123 | sec->sec_size += ROUND_UP(inst->size, BLOCK_SIZE) / BLOCK_SIZE; |
124 | } | 124 | } |
125 | else if(inst->inst == SB_INST_NOP) | ||
126 | { | ||
127 | if(g_debug) | ||
128 | printf(" NOOP\n"); | ||
129 | sb->image_size += sizeof(struct sb_instruction_nop_t) / BLOCK_SIZE; | ||
130 | sec->sec_size += sizeof(struct sb_instruction_nop_t) / BLOCK_SIZE; | ||
131 | } | ||
125 | else | 132 | else |
126 | { | 133 | { |
127 | if(g_debug) | 134 | if(g_debug) |
@@ -445,7 +452,7 @@ enum sb_error_t sb_write_file(struct sb_file_t *sb, const char *filename) | |||
445 | if(buf_p - buf != sb_hdr.image_size * BLOCK_SIZE) | 452 | if(buf_p - buf != sb_hdr.image_size * BLOCK_SIZE) |
446 | { | 453 | { |
447 | if(g_debug) | 454 | if(g_debug) |
448 | printf("SB image buffer was not entirely filled !"); | 455 | printf("SB image buffer was not entirely filled !\n"); |
449 | return SB_ERROR; | 456 | return SB_ERROR; |
450 | } | 457 | } |
451 | 458 | ||