Compare commits
3 commits
6707923afb
...
89aacc5041
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
89aacc5041 | ||
|
|
4d486e6c4f | ||
|
|
3f9d0b7468 |
2 changed files with 3 additions and 6 deletions
4
isr.h
4
isr.h
|
|
@ -8,13 +8,13 @@ void init_vic(void);
|
|||
static inline unsigned int cpsr(void)
|
||||
{
|
||||
unsigned int r;
|
||||
__asm__ __volatile__ ("MRS %0, CPSR" : "=r" (r));
|
||||
__asm__ __volatile__ ("MRS %0, CPSR" : "=r" (r) :: "memory");
|
||||
return r;
|
||||
}
|
||||
|
||||
static inline void cpsr_c(unsigned int r)
|
||||
{
|
||||
__asm__ __volatile__ ("MSR CPSR_c, %0" :: "r" (r));
|
||||
__asm__ __volatile__ ("MSR CPSR_c, %0" :: "r" (r) : "memory");
|
||||
}
|
||||
|
||||
static inline unsigned int disable_irq(unsigned int flag)
|
||||
|
|
|
|||
5
parser.c
5
parser.c
|
|
@ -62,10 +62,7 @@ error_msg_t expect_char(struct command *cmd, char what)
|
|||
{
|
||||
if (parse_char(cmd, what))
|
||||
return 0;
|
||||
static char mes[] = ". expected\n";
|
||||
static ERRORMESSAGE(error, 709, mes);
|
||||
mes[0] = what;
|
||||
return &error;
|
||||
return error_printf(709, "%c expected\n", what);
|
||||
}
|
||||
|
||||
const struct keywords *parse_keyword(struct command *cmd, const struct keywords *table)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue