Firebee/FireBee_SVN
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(Hopefully) fixed wrong calculation of BaS copy adresses

Browse Source
This commit is contained in:
Markus Fröschle
2012-10-15 06:14:43 +00:00
parent 9663851dba
commit e1a84ff9ab
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
BaS_GNU/sources/sysinit.c
View File

@@ -794,26 +794,26 @@ asm(
} }
/* copy the BaS code contained in flash to its final location */ /* copy the BaS code contained in flash to its final location */
src = copy_start; src = &copy_start;
dst = Bas_base; dst = &Bas_base;
jmp = (uint8_t *) BaS - copy_start + Bas_base; jmp = (uint8_t *) &BaS - (uint32_t) &copy_start + (uint32_t) &Bas_base;
do { do {
*src++ = *dst++; *src++ = *dst++;
*src++ = *dst++; *src++ = *dst++;
*src++ = *dst++; *src++ = *dst++;
*src++ = *dst++; *src++ = *dst++;
} while (src < (uint8_t *) copy_end); } while (src < (uint8_t *) &copy_end);
flushDataCacheRegion(Bas_base, (uint8_t *) copy_end - copy_start); flushDataCacheRegion(Bas_base, (uint8_t *) &copy_end - copy_start);
flushInstructionCacheRegion(Bas_base, (uint8_t *) copy_end - copy_start); flushInstructionCacheRegion(Bas_base, (uint8_t *) &copy_end - copy_start);
asm volatile( __asm__ __volatile__(
" .global _copy_start | \n\t" " .global _copy_start | \n\t"
" move.l %0,a3 | calculated start address\n\t" " move.l %0,a3 | calculated start address\n\t"
" jmp (a3) | go! \n\t" " jmp (a3) | go! \n\t"
"_copy_start: | \n\t" "_copy_start: | \n\t"
/* output */ : /* output */ :
/* input */ : "g" (jmp) /* input */ : "g" (jmp)
/* clobber */: "a3" /* clobber */: "a3", "memory"
); );
} }