void spend_cycles(int c);\r
void cache_clean(void);\r
void cache_clean_flush(void);\r
+// this should help to resolve race confition where shared var\r
+// is changed by other core just before we update it\r
+void set_if_not_changed(int *val, int oldval, int newval);\r
\r
// asm volatile ("mov r0, #0" ::: "r0");\r
// asm volatile ("mcr p15, 0, r0, c7, c6, 0" ::: "r0"); /* flush dcache */\r
// asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0"); /* drain write buffer */\r
\r
-void Main940(int startvector)\r
+\r
+static void mp3_decode(void)\r
+{\r
+ int mp3_offs = shared_ctl->mp3_offs;\r
+ unsigned char *readPtr = mp3_data + mp3_offs;\r
+ int bytesLeft = shared_ctl->mp3_len - mp3_offs;\r
+ int offset; // frame offset from readPtr\r
+ int err;\r
+\r
+ if (bytesLeft <= 0) return; // EOF, nothing to do\r
+\r
+ offset = MP3FindSyncWord(readPtr, bytesLeft);\r
+ if (offset < 0) {\r
+ set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len);\r
+ return; // EOF\r
+ }\r
+ readPtr += offset;\r
+ bytesLeft -= offset;\r
+\r
+ err = MP3Decode(shared_data->mp3dec, &readPtr, &bytesLeft,\r
+ shared_data->mp3_buffer[shared_ctl->mp3_buffsel], 0);\r
+ if (err) {\r
+ if (err == ERR_MP3_INDATA_UNDERFLOW) {\r
+ shared_ctl->mp3_offs = shared_ctl->mp3_len; // EOF\r
+ set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, shared_ctl->mp3_len);\r
+ return;\r
+ } else if (err <= -6 && err >= -12) {\r
+ // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*\r
+ // just try to skip the offending frame..\r
+ readPtr++;\r
+ }\r
+ shared_ctl->mp3_errors++;\r
+ shared_ctl->mp3_lasterr = err;\r
+ }\r
+ set_if_not_changed(&shared_ctl->mp3_offs, mp3_offs, readPtr - mp3_data);\r
+}\r
+\r
+\r
+void Main940(int startvector, int pc_at_irq)\r
{\r
ym2612_940 = &shared_data->ym2612;\r
mix_buffer = shared_data->mix_buffer;\r
\r
// debug\r
shared_ctl->vstarts[startvector]++;\r
+ shared_ctl->last_irq_pc = pc_at_irq;\r
// asm volatile ("mcr p15, 0, r0, c7, c10, 4" ::: "r0");\r
\r
\r
- for (;;)\r
+// for (;;)\r
{\r
int job_num = 0;\r
/*\r
spend_cycles(8*1024);\r
}\r
*/\r
+/*\r
if (!shared_ctl->busy)\r
{\r
wait_irq();\r
}\r
+ shared_ctl->lastbusy = shared_ctl->busy;\r
+*/\r
\r
for (job_num = 0; job_num < MAX_940JOBS; job_num++)\r
{\r
+ shared_ctl->lastjob = (job_num << 8) | shared_ctl->jobs[job_num];\r
+\r
switch (shared_ctl->jobs[job_num])\r
{\r
case JOB940_INITALL:\r
YM2612Write_(d >> 8, d);\r
}\r
\r
- YM2612UpdateOne_(0, shared_ctl->length, shared_ctl->stereo);\r
+ YM2612UpdateOne_(mix_buffer, shared_ctl->length, shared_ctl->stereo, 1);\r
break;\r
}\r
\r
- case JOB940_MP3DECODE: {\r
- int mp3_offs = shared_ctl->mp3_offs;\r
- unsigned char *readPtr = mp3_data + mp3_offs;\r
- int bytesLeft = shared_ctl->mp3_len - mp3_offs;\r
- int offset; // frame offset from readPtr\r
- int err;\r
-\r
- if (bytesLeft <= 0) break; // EOF, nothing to do\r
-\r
- offset = MP3FindSyncWord(readPtr, bytesLeft);\r
- if (offset < 0) {\r
- shared_ctl->mp3_offs = shared_ctl->mp3_len;\r
- break; // EOF\r
- }\r
- readPtr += offset;\r
- bytesLeft -= offset;\r
-\r
- err = MP3Decode(shared_data->mp3dec, &readPtr, &bytesLeft,\r
- shared_data->mp3_buffer[shared_ctl->mp3_buffsel], 0);\r
- if (err) {\r
- if (err == ERR_MP3_INDATA_UNDERFLOW) {\r
- shared_ctl->mp3_offs = shared_ctl->mp3_len; // EOF\r
- break;\r
- } else if (err <= -6 && err >= -12) {\r
- // ERR_MP3_INVALID_FRAMEHEADER, ERR_MP3_INVALID_*\r
- // just try to skip the offending frame..\r
- readPtr++;\r
- }\r
- shared_ctl->mp3_errors++;\r
- shared_ctl->mp3_lasterr = err;\r
- }\r
- shared_ctl->mp3_offs = readPtr - mp3_data;\r
+ case JOB940_MP3DECODE:\r
+ mp3_decode();\r
break;\r
- }\r
}\r
}\r
\r
// cache_clean_flush();\r
\r
shared_ctl->loopc++;\r
- shared_ctl->busy = 0;\r
+\r
+// // shared_ctl->busy = 0; // shared mem is not reliable?\r
+\r
+ wait_irq();\r
}\r
}\r
\r