From: bernie Date: Sun, 10 Aug 2008 19:19:28 +0000 (+0000) Subject: PUSH_CALL_FRAME(): Renamed from PUSH_CALL_CONTEXT(). X-Git-Tag: 2.0.0~319 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=9740751dcd61ec99e1af95846d4c3b197a128d8a;p=bertos.git PUSH_CALL_FRAME(): Renamed from PUSH_CALL_CONTEXT(). git-svn-id: https://src.develer.com/svnoss/bertos/trunk@1615 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/bertos/cpu/attr.h b/bertos/cpu/attr.h index 28986936..c5f0201e 100644 --- a/bertos/cpu/attr.h +++ b/bertos/cpu/attr.h @@ -310,7 +310,7 @@ * RTS discards SR while returning (it does not restore it). So we push * 0 to fake the same context. */ - #define CPU_PUSH_CALL_CONTEXT(sp, func) \ + #define CPU_PUSH_CALL_FRMAE(sp, func) \ do { \ CPU_PUSH_WORD((sp), (func)); \ CPU_PUSH_WORD((sp), 0x100); \ @@ -322,7 +322,7 @@ * memory accesses are big-endian (actually, it's a 8-bit CPU, so there is * no natural endianess). */ - #define CPU_PUSH_CALL_CONTEXT(sp, func) \ + #define CPU_PUSH_CALL_FRAME(sp, func) \ do { \ uint16_t funcaddr = (uint16_t)(func); \ CPU_PUSH_WORD((sp), funcaddr); \ @@ -355,14 +355,14 @@ #elif CPU_PPC - #define CPU_PUSH_CALL_CONTEXT(sp, func) \ + #define CPU_PUSH_CALL_FRAME(sp, func) \ do { \ CPU_PUSH_WORD((sp), (cpustack_t)(func)); /* LR -> 8(SP) */ \ CPU_PUSH_WORD((sp), 0); /* CR -> 4(SP) */ \ } while (0) #else - #define CPU_PUSH_CALL_CONTEXT(sp, func) \ + #define CPU_PUSH_CALL_FRAME(sp, func) \ CPU_PUSH_WORD((sp), (cpustack_t)(func)) #endif diff --git a/bertos/kern/proc.c b/bertos/kern/proc.c index 5674038c..84c53663 100644 --- a/bertos/kern/proc.c +++ b/bertos/kern/proc.c @@ -221,8 +221,8 @@ struct Process *proc_new_with_name(UNUSED(const char *, name), void (*entry)(voi #endif /* Initialize process stack frame */ - CPU_PUSH_CALL_CONTEXT(proc->stack, proc_exit); - CPU_PUSH_CALL_CONTEXT(proc->stack, entry); + CPU_PUSH_CALL_FRAME(proc->stack, proc_exit); + CPU_PUSH_CALL_FRAME(proc->stack, entry); /* Push a clean set of CPU registers for asm_switch_context() */ for (i = 0; i < CPU_SAVED_REGS_CNT; i++)