devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Make bin2c ensure that the generated C arrays are 32bit aligned. Building nrv2e_d8 with the eabi toolchain breaks this assumption

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25071 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Thomas Martitz 2010-03-08 16:05:08 +00:00
parent 29a602cb80
commit ccefc95d8e
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rbutil/mkamsboot/dualboot/bin2c.c
View file

@ -97,6 +97,7 @@ int main (int argc, char* argv[])
for(i=0; i < argc - 2; i++) { for(i=0; i < argc - 2; i++) {
unsigned char* buf; unsigned char* buf;
off_t len; off_t len;
off_t orig_len;
char *ext; char *ext;
char *array = argv[2+i]; char *array = argv[2+i];
@ -108,14 +109,20 @@ int main (int argc, char* argv[])
return 4; return 4;
} }
len = filesize(fd); orig_len = filesize(fd);
/* pad to 32bit */
len = (orig_len + 3) & ~3;
buf = malloc(len); buf = malloc(len);
if (read(fd,buf,len) < len) { if (read(fd,buf,orig_len) < orig_len) {
fprintf(stderr,"Short read, aborting\n"); fprintf(stderr,"Short read, aborting\n");
return 5; return 5;
} }
/* pad to 32bit with zeros */
if (len > orig_len)
memset(buf+orig_len, 0, len-orig_len);
/* remove file extension */ /* remove file extension */
ext = strchr (array, '.'); ext = strchr (array, '.');
if (ext != NULL) if (ext != NULL)