dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

CRIS v32: Update vcs_hook.c for ETRAX FS. 

- Clean up some formatting and whitespace.
This commit is contained in:
Jesper Nilsson 2008-01-25 17:28:10 +01:00
parent 09160d7cc3
commit a474de0a02
2 changed files with 88 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
arch/cris/arch-v32/mach-fs/vcs_hook.c
View File

@ -1,8 +1,7 @@
// $Id: vcs_hook.c,v 1.2 2003/08/12 12:01:06 starvik Exp $ /*
// * Call simulator hook. This is the part running in the
// Call simulator hook. This is the part running in the * simulated program.
// simulated program. */
//
#include "vcs_hook.h" #include "vcs_hook.h"
#include <stdarg.h> #include <stdarg.h>
@ -14,12 +13,14 @@
#define HOOK_DATA(offset) ((unsigned *)HOOK_MEM_BASE_ADDR)[offset] #define HOOK_DATA(offset) ((unsigned *)HOOK_MEM_BASE_ADDR)[offset]
#define VHOOK_DATA(offset) ((volatile unsigned *)HOOK_MEM_BASE_ADDR)[offset] #define VHOOK_DATA(offset) ((volatile unsigned *)HOOK_MEM_BASE_ADDR)[offset]
#define HOOK_TRIG(funcid) do { *((unsigned *) HOOK_TRIG_ADDR) = funcid; } while(0) #define HOOK_TRIG(funcid) \
do { \
*((unsigned *) HOOK_TRIG_ADDR) = funcid; \
} while (0)
#define HOOK_DATA_BYTE(offset) ((unsigned char *)HOOK_MEM_BASE_ADDR)[offset] #define HOOK_DATA_BYTE(offset) ((unsigned char *)HOOK_MEM_BASE_ADDR)[offset]
int hook_call(unsigned id, unsigned pcnt, ...)
// ------------------------------------------------------------------ hook_call {
int hook_call( unsigned id, unsigned pcnt, ...) {
va_list ap; va_list ap;
unsigned i; unsigned i;
unsigned ret; unsigned ret;
@ -27,12 +28,12 @@ int hook_call( unsigned id, unsigned pcnt, ...) {
PREEMPT_OFF_SAVE(); PREEMPT_OFF_SAVE();
#endif #endif
// pass parameters /* pass parameters */
HOOK_DATA(0) = id; HOOK_DATA(0) = id;
/* Have to make hook_print_str a special case since we call with a /* Have to make hook_print_str a special case since we call with a
parameter of byte type. Should perhaps be a separate * parameter of byte type. Should perhaps be a separate
hook_call. */ * hook_call. */
if (id == hook_print_str) { if (id == hook_print_str) {
int i; int i;
@ -43,27 +44,28 @@ int hook_call( unsigned id, unsigned pcnt, ...) {
va_start(ap, pcnt); va_start(ap, pcnt);
str = (char *)va_arg(ap, unsigned); str = (char *)va_arg(ap, unsigned);
for (i=0; i!=pcnt; i++) { for (i = 0; i != pcnt; i++)
HOOK_DATA_BYTE(8 + i) = str[i]; HOOK_DATA_BYTE(8 + i) = str[i];
}
HOOK_DATA_BYTE(8 + i) = 0; /* null byte */ HOOK_DATA_BYTE(8 + i) = 0; /* null byte */
} } else {
else {
va_start(ap, pcnt); va_start(ap, pcnt);
for( i = 1; i <= pcnt; i++ ) HOOK_DATA(i) = va_arg(ap,unsigned); for (i = 1; i <= pcnt; i++)
HOOK_DATA(i) = va_arg(ap, unsigned);
va_end(ap); va_end(ap);
} }
// read from mem to make sure data has propagated to memory before trigging /* read from mem to make sure data has propagated to memory before
*((volatile unsigned*) HOOK_MEM_BASE_ADDR); * trigging */
ret = *((volatile unsigned *)HOOK_MEM_BASE_ADDR);
// trigger hook /* trigger hook */
HOOK_TRIG(id); HOOK_TRIG(id);
// wait for call to finish /* wait for call to finish */
while( VHOOK_DATA(0) > 0 ) {} while (VHOOK_DATA(0) > 0) ;
// extract return value /* extract return value */
ret = VHOOK_DATA(1); ret = VHOOK_DATA(1);
@ -73,24 +75,26 @@ int hook_call( unsigned id, unsigned pcnt, ...) {
return ret; return ret;
} }
unsigned unsigned hook_buf(unsigned i)
hook_buf(unsigned i)
{ {
return (HOOK_DATA(i)); return (HOOK_DATA(i));
} }
void print_str( const char *str ) { void print_str(const char *str)
{
int i; int i;
for (i=1; str[i]; i++); /* find null at end of string */ /* find null at end of string */
for (i = 1; str[i]; i++) ;
hook_call(hook_print_str, i, str); hook_call(hook_print_str, i, str);
} }
// --------------------------------------------------------------- CPU_KICK_DOG void CPU_KICK_DOG(void)
void CPU_KICK_DOG(void) { {
(void)hook_call(hook_kick_dog, 0); (void)hook_call(hook_kick_dog, 0);
} }
// ------------------------------------------------------- CPU_WATCHDOG_TIMEOUT void CPU_WATCHDOG_TIMEOUT(unsigned t)
void CPU_WATCHDOG_TIMEOUT( unsigned t ) { {
(void)hook_call(hook_dog_timeout, 1, t); (void)hook_call(hook_dog_timeout, 1, t);
} }

6
arch/cris/arch-v32/mach-fs/vcs_hook.h
View File

@ -1,6 +1,6 @@
// $Id: vcs_hook.h,v 1.1 2003/08/12 12:01:06 starvik Exp $ /*
// * Call simulator hook functions
// Call simulator hook functions */
#ifndef HOOK_H #ifndef HOOK_H
#define HOOK_H #define HOOK_H