rarias/ovni
rarias/ovni
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Simplify nosv subsystem enter-exit functions

Browse Source
This commit is contained in:
Rodrigo Arias 2021-10-14 07:05:59 +02:00
parent 78656ce83a
commit 351419a04d
1 changed files with 13 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

156
emu_nosv.c
View File

@ -352,7 +352,7 @@ pre_sched(struct ovni_emu *emu)
} }
static void static void
pre_pause(struct ovni_emu *emu) pre_ss(struct ovni_emu *emu, int st)
{ {
struct ovni_ethread *th; struct ovni_ethread *th;
struct ovni_chan *chan_th; struct ovni_chan *chan_th;
@ -363,145 +363,15 @@ pre_pause(struct ovni_emu *emu)
switch(emu->cur_ev->header.value) switch(emu->cur_ev->header.value)
{ {
case '[': case '[':
chan_push(chan_th, ST_PAUSE); chan_push(chan_th, st);
break; break;
case ']': case ']':
chan_pop(chan_th, ST_PAUSE); chan_pop(chan_th, st);
break; break;
default: default:
break; err("unexpected value '%c' (expecting '[' or ']')\n",
} emu->cur_ev->header.value);
} abort();
static void
pre_yield(struct ovni_emu *emu)
{
struct ovni_ethread *th;
struct ovni_chan *chan_th;
th = emu->cur_thread;
chan_th = &th->chan[CHAN_NOSV_SUBSYSTEM];
switch(emu->cur_ev->header.value)
{
case '[':
chan_push(chan_th, ST_YIELD);
break;
case ']':
chan_pop(chan_th, ST_YIELD);
break;
default:
break;
}
}
static void
pre_waitfor(struct ovni_emu *emu)
{
struct ovni_ethread *th;
struct ovni_chan *chan_th;
th = emu->cur_thread;
chan_th = &th->chan[CHAN_NOSV_SUBSYSTEM];
switch(emu->cur_ev->header.value)
{
case '[':
chan_push(chan_th, ST_WAITFOR);
break;
case ']':
chan_pop(chan_th, ST_WAITFOR);
break;
default:
break;
}
}
static void
pre_schedpoint(struct ovni_emu *emu)
{
struct ovni_ethread *th;
struct ovni_chan *chan_th;
th = emu->cur_thread;
chan_th = &th->chan[CHAN_NOSV_SUBSYSTEM];
switch(emu->cur_ev->header.value)
{
case '[':
chan_push(chan_th, ST_SCHEDPOINT);
break;
case ']':
chan_pop(chan_th, ST_SCHEDPOINT);
break;
default:
break;
}
}
static void
pre_submit(struct ovni_emu *emu)
{
struct ovni_ethread *th;
struct ovni_chan *chan_th;
th = emu->cur_thread;
chan_th = &th->chan[CHAN_NOSV_SUBSYSTEM];
switch(emu->cur_ev->header.value)
{
case '[':
chan_push(chan_th, ST_SCHED_SUBMITTING);
break;
case ']':
chan_pop(chan_th, ST_SCHED_SUBMITTING);
break;
default:
break;
}
}
static void
pre_memory(struct ovni_emu *emu)
{
struct ovni_ethread *th;
struct ovni_chan *chan_th;
th = emu->cur_thread;
chan_th = &th->chan[CHAN_NOSV_SUBSYSTEM];
switch(emu->cur_ev->header.value)
{
case '[':
chan_push(chan_th, ST_MEM_ALLOCATING);
break;
case ']':
chan_pop(chan_th, ST_MEM_ALLOCATING);
break;
default:
break;
}
}
static void
pre_code(struct ovni_emu *emu)
{
struct ovni_ethread *th;
struct ovni_chan *chan_th;
th = emu->cur_thread;
chan_th = &th->chan[CHAN_NOSV_SUBSYSTEM];
switch(emu->cur_ev->header.value)
{
case '[':
chan_push(chan_th, ST_NOSV_CODE);
break;
case ']':
chan_pop(chan_th, ST_NOSV_CODE);
break;
default:
break;
} }
} }
@ -515,13 +385,13 @@ hook_pre_nosv(struct ovni_emu *emu)
case 'T': pre_task(emu); break; case 'T': pre_task(emu); break;
case 'Y': pre_type(emu); break; case 'Y': pre_type(emu); break;
case 'S': pre_sched(emu); break; case 'S': pre_sched(emu); break;
case 'U': pre_submit(emu); break; case 'U': pre_ss(emu, ST_SCHED_SUBMITTING); break;
case 'M': pre_memory(emu); break; case 'M': pre_ss(emu, ST_MEM_ALLOCATING); break;
case 'P': pre_pause(emu); break; case 'P': pre_ss(emu, ST_PAUSE); break;
case 'I': pre_yield(emu); break; case 'I': pre_ss(emu, ST_YIELD); break;
case 'W': pre_waitfor(emu); break; case 'W': pre_ss(emu, ST_WAITFOR); break;
case 'D': pre_schedpoint(emu); break; case 'D': pre_ss(emu, ST_SCHEDPOINT); break;
case 'C': pre_code(emu); break; case 'C': pre_ss(emu, ST_NOSV_CODE); break;
default: default:
break; break;
} }