Changeset 0f81ceb7 in mainline for kernel/generic/src/console/cmd.c

Timestamp:

2009-02-12T20:03:07Z (16 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

95b9963

Parents:

8a72a9a

Message:

remove platform dependent constructs from generic code

File:

• kernel/generic/src/console/cmd.c (modified) (9 diffs)

kernel/generic/src/console/cmd.c

@@ -617 +617 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*f)(void);
-#ifdef ia64
-        struct {
-                unative_t f;
-                unative_t gp;
-        } fptr;
-#endif
-
+        unative_t (*fnc)(void);
+        fncptr_t fptr;
+        
         symaddr = get_symbol_addr((char *) argv->buffer);
         if (!symaddr)
@@ -633 +628 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
+                fnc = (unative_t (*)(void)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call0);
                 printf("Calling %s() (%p)\n", symbol, symaddr);
-#ifdef ia64
-                fptr.f = symaddr;
-                fptr.gp = ((unative_t *)cmd_call2)[1];
-                f =  (unative_t (*)(void)) &fptr;
-#else
-                f =  (unative_t (*)(void)) symaddr;
-#endif
-                printf("Result: %#" PRIxn "\n", f());
+                printf("Result: %#" PRIxn "\n", fnc());
         }
         
@@ -681 +670 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*f)(unative_t,...);
+        unative_t (*fnc)(unative_t, ...);
         unative_t arg1 = argv[1].intval;
-#ifdef ia64
-        struct {
-                unative_t f;
-                unative_t gp;
-        } fptr;
-#endif
-
+        fncptr_t fptr;
+        
         symaddr = get_symbol_addr((char *) argv->buffer);
         if (!symaddr)
@@ -698 +682 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
-
+                fnc = (unative_t (*)(unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call1);
                 printf("Calling f(%#" PRIxn "): %p: %s\n", arg1, symaddr, symbol);
-#ifdef ia64
-                fptr.f = symaddr;
-                fptr.gp = ((unative_t *)cmd_call2)[1];
-                f =  (unative_t (*)(unative_t,...)) &fptr;
-#else
-                f =  (unative_t (*)(unative_t,...)) symaddr;
-#endif
-                printf("Result: %#" PRIxn "\n", f(arg1));
+                printf("Result: %#" PRIxn "\n", fnc(arg1));
         }
         
@@ -718 +695 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*f)(unative_t,unative_t,...);
+        unative_t (*fnc)(unative_t, unative_t, ...);
         unative_t arg1 = argv[1].intval;
         unative_t arg2 = argv[2].intval;
-#ifdef ia64
-        struct {
-                unative_t f;
-                unative_t gp;
-        }fptr;
-#endif
-
+        fncptr_t fptr;
+        
         symaddr = get_symbol_addr((char *) argv->buffer);
         if (!symaddr)
@@ -736 +708 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
+                fnc = (unative_t (*)(unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call2);
                 printf("Calling f(%#" PRIxn ", %#" PRIxn "): %p: %s\n", 
                        arg1, arg2, symaddr, symbol);
-#ifdef ia64
-                fptr.f = symaddr;
-                fptr.gp = ((unative_t *)cmd_call2)[1];
-                f =  (unative_t (*)(unative_t,unative_t,...)) &fptr;
-#else
-                f =  (unative_t (*)(unative_t,unative_t,...)) symaddr;
-#endif
-                printf("Result: %#" PRIxn "\n", f(arg1, arg2));
+                printf("Result: %#" PRIxn "\n", fnc(arg1, arg2));
         }
         
@@ -756 +722 @@
         uintptr_t symaddr;
         char *symbol;
-        unative_t (*f)(unative_t,unative_t,unative_t,...);
+        unative_t (*fnc)(unative_t, unative_t, unative_t, ...);
         unative_t arg1 = argv[1].intval;
         unative_t arg2 = argv[2].intval;
         unative_t arg3 = argv[3].intval;
-#ifdef ia64
-        struct {
-                unative_t f;
-                unative_t gp;
-        }fptr;
-#endif
-
+        fncptr_t fptr;
+        
         symaddr = get_symbol_addr((char *) argv->buffer);
         if (!symaddr)
@@ -775 +736 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
+                fnc = (unative_t (*)(unative_t, unative_t, unative_t, ...)) arch_construct_function(&fptr, (void *) symaddr, (void *) cmd_call3);
                 printf("Calling f(%#" PRIxn ",%#" PRIxn ", %#" PRIxn "): %p: %s\n", 
                        arg1, arg2, arg3, symaddr, symbol);
-#ifdef ia64
-                fptr.f = symaddr;
-                fptr.gp = ((unative_t *)cmd_call2)[1];
-                f =  (unative_t (*)(unative_t,unative_t,unative_t,...)) &fptr;
-#else
-                f =  (unative_t (*)(unative_t,unative_t,unative_t,...)) symaddr;
-#endif
-                printf("Result: %#" PRIxn "\n", f(arg1, arg2, arg3));
+                printf("Result: %#" PRIxn "\n", fnc(arg1, arg2, arg3));
         }
         
@@ -997 +952 @@
         
         for (test = tests; test->name != NULL; test++)
-                printf("%s\t\t%s%s\n", test->name, test->desc, (test->safe ? "" : " (unsafe)"));
-        
-        printf("*\t\tRun all safe tests\n");
+                printf("%-10s %s%s\n", test->name, test->desc, (test->safe ? "" : " (unsafe)"));
+        
+        printf("%-10s Run all safe tests\n", "*");
         return 1;
 }