Changeset 7ba7c6d in mainline

Timestamp:

2006-10-08T20:09:28Z (18 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

e4398200

Parents:

64c2ad5

Message:

A quote from from SPARC V9 specification:

The Y register is deprecated; it is provided only for compatibility with previous versions
of the architecture. It should not be used in new SPARC-V9 software. It is
recommended that all instructions that reference the Y register (i.e., SMUL,
SMULcc, UMUL, UMULcc, MULScc, SDIV, SDIVcc, UDIV, UDIVcc, RDY, and
WRY) be avoided. See the appropriate pages in Appendix A, “Instruction Definitions,”
for suitable substitute instructions.

Still gcc is generating code which uses Y and some of the instructions above.
This change modifies the preemptible_handler() to preserve the Y register
across preemption.

Location:

kernel

Files:

• arch/sparc64/include/trap/trap_table.h (modified) (1 diff)
• arch/sparc64/src/dummy.s (modified) (1 diff)
• arch/sparc64/src/trap/trap_table.S (modified) (2 diffs)
• doc/arch/sparc64 (modified) (1 diff)
• generic/src/mm/as.c (modified) (1 diff)

kernel/arch/sparc64/include/trap/trap_table.h

@@ -85 +85 @@
 #define SAVED_TPC       -(2*8)
 #define SAVED_TNPC      -(3*8)          /* <-- istate_t begins here */
-/* alignment gap */
+#define SAVED_Y         -(4*8)
 #define SAVED_I0        -(5*8)
 #define SAVED_I1        -(6*8)

kernel/arch/sparc64/src/dummy.s

@@ -34 +34 @@
 .global dummy
 
-cpu_sleep:
-sys_tls_set:
+cpu_sleep:              ! not supported by architecture
+sys_tls_set:            ! not needed on architecture
 
 dummy:

kernel/arch/sparc64/src/trap/trap_table.S

@@ -747 +747 @@
         stx %g2, [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_TPC]
         stx %g3, [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_TNPC]
+
+        /*
+         * Save the Y register.
+         * This register is deprecated according to SPARC V9 specification
+         * and is only present for backward compatibility with previous
+         * versions of the SPARC architecture.
+         * Surprisingly, gcc makes use of this register without a notice.
+         */
+        rd %y, %g4
+        stx %g4, [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_Y]
         
         wrpr %g0, 0, %tl
@@ -776 +786 @@
         ldx [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_TPC], %g2
         ldx [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_TNPC], %g3
+
+        /*
+         * Restore Y.
+         */
+        ldx [%sp + PREEMPTIBLE_HANDLER_STACK_FRAME_SIZE + STACK_BIAS + SAVED_Y], %g4
+        wr %g4, %y
 
         /*

kernel/doc/arch/sparc64

@@ -17 +17 @@
 
 SIMULATORS
-        o simics 2.2.19, simics 3.0.17
+        o simics 2.2.19, simics 3.0.17, simics 3.0.21
                                                 
 TOOLCHAIN REQUIREMENTS

kernel/generic/src/mm/as.c

@@ -1593 +1593 @@
         link_t *cur;
         for (cur = as->as_area_btree.leaf_head.next; cur != &as->as_area_btree.leaf_head; cur = cur->next) {
-                as_area_t *area;
-                btree_node_t *node;
-                
-                node = list_get_instance(cur, btree_node_t, leaf_link);
+                btree_node_t *node = list_get_instance(cur, btree_node_t, leaf_link);
                 
                 int i;
                 for (i = 0; i < node->keys; i++) {
-                        area = node->value[i];
+                        as_area_t *area = node->value[i];
                 
                         mutex_lock(&area->lock);