Stephan/irena-arm
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Stephan:89aacc5041ac8e6b4603b460bcef98c85b9c12e4
Branches Tags
Stephan:master
Stephan:dlrena
..
compare: Stephan:6707923afbc38a08118aed1a432d5681154fde7e
Branches Tags
Stephan:master
Stephan:dlrena

No commits in common. "89aacc5041ac8e6b4603b460bcef98c85b9c12e4" and "6707923afbc38a08118aed1a432d5681154fde7e" have entirely different histories.
89aacc5041 ... 6707923afb

2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
isr.h
View file

@ -8,13 +8,13 @@ void init_vic(void);
static inline unsigned int cpsr(void) static inline unsigned int cpsr(void)
{ {
unsigned int r; unsigned int r;
__asm__ __volatile__ ("MRS %0, CPSR" : "=r" (r) :: "memory"); __asm__ __volatile__ ("MRS %0, CPSR" : "=r" (r));
return r; return r;
} }
static inline void cpsr_c(unsigned int r) static inline void cpsr_c(unsigned int r)
{ {
__asm__ __volatile__ ("MSR CPSR_c, %0" :: "r" (r) : "memory"); __asm__ __volatile__ ("MSR CPSR_c, %0" :: "r" (r));
} }
static inline unsigned int disable_irq(unsigned int flag) static inline unsigned int disable_irq(unsigned int flag)

5
parser.c
View file

@ -62,7 +62,10 @@ error_msg_t expect_char(struct command *cmd, char what)
{ {
if (parse_char(cmd, what)) if (parse_char(cmd, what))
return 0; return 0;
return error_printf(709, "%c expected\n", what); static char mes[] = ". expected\n";
static ERRORMESSAGE(error, 709, mes);
mes[0] = what;
return &error;
} }
const struct keywords *parse_keyword(struct command *cmd, const struct keywords *table) const struct keywords *parse_keyword(struct command *cmd, const struct keywords *table)