Changeset 3701250 in mainline

Timestamp:

2006-06-08T13:20:17Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

14df080

Parents:

bf56fef

Message:

Slightly better test.
Made call keys work on ia64.

Files:

• generic/src/console/cmd.c (modified) (8 diffs)
• test/mm/slab2/test.c (modified) (2 diffs)

generic/src/console/cmd.c

@@ -478 +478 @@
         char *symbol;
         __native (*f)(void);
+#ifdef ia64
+        struct {
+                __native f;
+                __native gp;
+        }fptr;
+#endif
 
         symaddr = get_symbol_addr(argv->buffer);
@@ -488 +494 @@
                 symbol = get_symtab_entry(symaddr);
                 printf("Calling f(): %.*p: %s\n", sizeof(__address) * 2, symaddr, symbol);
+#ifdef ia64
+                fptr.f = symaddr;
+                fptr.gp = ((__native *)cmd_call2)[1];
+                f =  (__native (*)(void)) &fptr;
+#else
                 f =  (__native (*)(void)) symaddr;
+#endif
                 printf("Result: %#zx\n", f());
         }
@@ -502 +514 @@
         __native (*f)(__native,...);
         __native arg1 = argv[1].intval;
+#ifdef ia64
+        struct {
+                __native f;
+                __native gp;
+        }fptr;
+#endif
 
         symaddr = get_symbol_addr(argv->buffer);
@@ -511 +529 @@
         } else {
                 symbol = get_symtab_entry(symaddr);
+
                 printf("Calling f(0x%zX): %.*p: %s\n", arg1, sizeof(__address) * 2, symaddr, symbol);
+#ifdef ia64
+                fptr.f = symaddr;
+                fptr.gp = ((__native *)cmd_call2)[1];
+                f =  (__native (*)(__native,...)) &fptr;
+#else
                 f =  (__native (*)(__native,...)) symaddr;
+#endif
                 printf("Result: %#zx\n", f(arg1));
         }
@@ -527 +552 @@
         __native arg1 = argv[1].intval;
         __native arg2 = argv[2].intval;
+#ifdef ia64
+        struct {
+                __native f;
+                __native gp;
+        }fptr;
+#endif
 
         symaddr = get_symbol_addr(argv->buffer);
@@ -538 +569 @@
                 printf("Calling f(0x%zx,0x%zx): %.*p: %s\n", 
                        arg1, arg2, sizeof(__address) * 2, symaddr, symbol);
+#ifdef ia64
+                fptr.f = symaddr;
+                fptr.gp = ((__native *)cmd_call2)[1];
+                f =  (__native (*)(__native,__native,...)) &fptr;
+#else
                 f =  (__native (*)(__native,__native,...)) symaddr;
+#endif
                 printf("Result: %#zx\n", f(arg1, arg2));
         }
@@ -554 +591 @@
         __native arg2 = argv[2].intval;
         __native arg3 = argv[3].intval;
+#ifdef ia64
+        struct {
+                __native f;
+                __native gp;
+        }fptr;
+#endif
 
         symaddr = get_symbol_addr(argv->buffer);
@@ -565 +608 @@
                 printf("Calling f(0x%zx,0x%zx, 0x%zx): %.*p: %s\n", 
                        arg1, arg2, arg3, sizeof(__address) * 2, symaddr, symbol);
+#ifdef ia64
+                fptr.f = symaddr;
+                fptr.gp = ((__native *)cmd_call2)[1];
+                f =  (__native (*)(__native,__native,__native,...)) &fptr;
+#else
                 f =  (__native (*)(__native,__native,__native,...)) symaddr;
+#endif
                 printf("Result: %#zx\n", f(arg1, arg2, arg3));
         }

test/mm/slab2/test.c

@@ -148 +148 @@
         while (data) {
                 new = *((void **)data);
+                *((void **)data) = NULL;
                 slab_free(thr_cache, data);
                 data = new;
@@ -163 +164 @@
         while (data) {
                 new = *((void **)data);
+                *((void **)data) = NULL;
                 slab_free(thr_cache, data);
                 data = new;