Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

More alignment fixes.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9275 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Miika Pekkarinen 2006-03-27 07:02:14 +00:00
parent e58589bb82
commit 58e32f18c8
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
apps/tagcache.c
View file

@ -1408,7 +1408,7 @@ static bool allocate_tagcache(void)
} }
/* Load the header. */ /* Load the header. */
hdr = (struct ramcache_header *)audiobuf; hdr = (struct ramcache_header *)(((long)audiobuf & ~0x03) + 0x04);
memset(hdr, 0, sizeof(struct ramcache_header)); memset(hdr, 0, sizeof(struct ramcache_header));
len = sizeof(struct tagcache_header); len = sizeof(struct tagcache_header);
rc = read(fd, &hdr->h, len); rc = read(fd, &hdr->h, len);
@ -1424,8 +1424,11 @@ static bool allocate_tagcache(void)
hdr->indices = (struct index_entry *)(hdr + 1); hdr->indices = (struct index_entry *)(hdr + 1);
/* Now calculate the required cache size. */ /**
tagcache_size = hdr->h.datasize + * Now calculate the required cache size plus
* some extra space for alignment fixes.
*/
tagcache_size = hdr->h.datasize + 128 +
sizeof(struct index_entry) * hdr->h.entry_count + sizeof(struct index_entry) * hdr->h.entry_count +
sizeof(struct ramcache_header) + TAG_COUNT*sizeof(void *); sizeof(struct ramcache_header) + TAG_COUNT*sizeof(void *);
logf("tagcache: %d bytes allocated.", tagcache_size); logf("tagcache: %d bytes allocated.", tagcache_size);
@ -1523,6 +1526,14 @@ static bool load_tagcache(void)
{ {
yield(); yield();
fe = (struct tagfile_entry *)p; fe = (struct tagfile_entry *)p;
#ifdef ROCKBOX_STRICT_ALIGN
/* Make sure the entry is long aligned. */
if ((long)fe & 0x03)
{
bytesleft -= 4 - ((long)fe & 0x03);
fe = (struct tagfile_entry *)(((long)fe & ~0x03) + 0x04);
}
#endif
rc = read(fd, fe, sizeof(struct tagfile_entry)); rc = read(fd, fe, sizeof(struct tagfile_entry));
if (rc != sizeof(struct tagfile_entry)) if (rc != sizeof(struct tagfile_entry))
{ {