zzy/NJU_PA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

> compile NEMU

Browse Source 
221220000 张三
Linux zzy 5.15.146.1-microsoft-standard-WSL2 #1 SMP Thu Jan 11 04:09:03 UTC 2024 x86_64 x86_64 x86_64 GNU/Linux
 13:07:07 up 4 days,  8:12,  1 user,  load average: 0.55, 0.68, 0.59
This commit is contained in:
tracer-ics2023
2024-09-21 13:07:08 +08:00
committed by zzy
parent 45ec806543
commit fe5d82779c
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
nemu/configs/tmp_defconfig Normal file
View File

@ -0,0 +1,3 @@
# CONFIG_ITRACE is not set
CONFIG_PMEM_MALLOC=y
CONFIG_DEVICE=y

15
nemu/src/device/audio.c
View File

@ -30,13 +30,15 @@ enum {
static uint8_t *sbuf = NULL; static uint8_t *sbuf = NULL;
static uint32_t *audio_base = NULL; static uint32_t *audio_base = NULL;
static uint32_t pos_read = 0; static uint32_t pos_read = 0;
static uint32_t audio_count = 0;
#define MIN(a, b) ((a) < (b) ? (a) : (b)) #define MIN(a, b) ((a) < (b) ? (a) : (b))
static void audio_callback(void *userdata, uint8_t *stream, int len) { static void audio_callback(void *userdata, uint8_t *stream, int len) {
uint32_t count = audio_base[reg_count]; SDL_LockAudio();
uint32_t count = audio_count;
uint32_t read_cnt = MIN(count, len); uint32_t read_cnt = MIN(count, len);
uint32_t to_end_cnt = audio_base[reg_sbuf_size] - pos_read; uint32_t to_end_cnt = CONFIG_SB_SIZE - pos_read;
int32_t out_bound_cnt = read_cnt - to_end_cnt; int32_t out_bound_cnt = read_cnt - to_end_cnt;
// memset(stream, 0, len); // memset(stream, 0, len);
if (out_bound_cnt > 0) { if (out_bound_cnt > 0) {
@ -46,9 +48,10 @@ static void audio_callback(void *userdata, uint8_t *stream, int len) {
memcpy(stream, sbuf + pos_read, read_cnt); memcpy(stream, sbuf + pos_read, read_cnt);
} }
pos_read += read_cnt; pos_read += read_cnt;
pos_read %= audio_base[reg_sbuf_size]; pos_read %= CONFIG_SB_SIZE;
if (len > read_cnt) memset(stream + read_cnt, 0, len - read_cnt); if (len > read_cnt) memset(stream + read_cnt, 0, len - read_cnt);
audio_base[reg_count] -= read_cnt; audio_count -= read_cnt;
SDL_UnlockAudio();
} }
static inline void init_audio_dev() { static inline void init_audio_dev() {
@ -82,7 +85,11 @@ static void audio_io_handler(uint32_t offset, int len, bool is_write) {
} }
break; break;
case reg_count: case reg_count:
SDL_LockAudio();
// TODO: must be add a lock here // TODO: must be add a lock here
if (is_write) audio_count = audio_base[reg_count];
else audio_base[reg_count] = audio_count;
SDL_UnlockAudio();
break; break;
default: default:
assert(0); assert(0);