diff options
| author | jake <jake@FreeBSD.org> | 2002-12-29 00:23:48 +0000 |
|---|---|---|
| committer | jake <jake@FreeBSD.org> | 2002-12-29 00:23:48 +0000 |
| commit | 9d2b79f22b90187c416d356cc9f00c934bac3c54 (patch) | |
| tree | 49bf07e520ff9c9c64aa5cbef9ba85a4112b58a3 /sys/sparc64 | |
| parent | a31665cd07e43c893205e571244da79cb1371a44 (diff) | |
| download | FreeBSD-src-9d2b79f22b90187c416d356cc9f00c934bac3c54.zip FreeBSD-src-9d2b79f22b90187c416d356cc9f00c934bac3c54.tar.gz | |
Use the meaningful mnemonics for ancillary state registers now that gas
is invoked properly to understand them.
%asr19 -> %gsr
%asr20 -> %set_softint
%asr21 -> %clear_softint
Diffstat (limited to 'sys/sparc64')
| -rw-r--r-- | sys/sparc64/sparc64/exception.S | 11 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/interrupt.S | 2 | ||||
| -rw-r--r-- | sys/sparc64/sparc64/mp_exception.S | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/sys/sparc64/sparc64/exception.S b/sys/sparc64/sparc64/exception.S index 1f255f2..7cb77bf 100644 --- a/sys/sparc64/sparc64/exception.S +++ b/sys/sparc64/sparc64/exception.S @@ -2178,7 +2178,7 @@ ENTRY(tl0_trap) wr %g0, FPRS_FEF, %fprs stx %fsr, [%sp + SPOFF + CCFSZ + TF_FSR] - rd %asr19, %l6 + rd %gsr, %l6 stx %l6, [%sp + SPOFF + CCFSZ + TF_GSR] wr %g0, 0, %fprs @@ -2245,7 +2245,7 @@ ENTRY(tl0_intr) #endif wrpr %o0, 0, %pil - wr %o1, 0, %asr21 + wr %o1, 0, %clear_softint and %l5, WSTATE_NORMAL_MASK, %l5 sllx %l5, WSTATE_OTHER_SHIFT, %l5 @@ -2265,7 +2265,7 @@ ENTRY(tl0_intr) wr %g0, FPRS_FEF, %fprs stx %fsr, [%sp + SPOFF + CCFSZ + TF_FSR] - rd %asr19, %l6 + rd %gsr, %l6 stx %l6, [%sp + SPOFF + CCFSZ + TF_GSR] wr %g0, 0, %fprs @@ -2442,11 +2442,10 @@ ENTRY(tl0_ret) /* * Restore %fsr and %gsr. These need floating point enabled in %fprs, * so we set it temporarily and then clear it. - * XXX %asr19 should be %gsr but gas is invoked incorrectly. */ wr %g0, FPRS_FEF, %fprs ldx [%sp + SPOFF + CCFSZ + TF_FSR], %fsr - wr %l1, 0, %asr19 + wr %l1, 0, %gsr wr %g0, 0, %fprs /* @@ -2769,7 +2768,7 @@ ENTRY(tl1_intr) #endif wrpr %o0, 0, %pil - wr %o1, 0, %asr21 + wr %o1, 0, %clear_softint wrpr %g0, 1, %tl diff --git a/sys/sparc64/sparc64/interrupt.S b/sys/sparc64/sparc64/interrupt.S index 0de7e5b..971de31 100644 --- a/sys/sparc64/sparc64/interrupt.S +++ b/sys/sparc64/sparc64/interrupt.S @@ -140,7 +140,7 @@ ENTRY(intr_vector) */ mov 1, %g1 sllx %g1, %g6, %g1 - wr %g1, 0, %asr20 + wr %g1, 0, %set_softint /* * Done, retry the instruction. diff --git a/sys/sparc64/sparc64/mp_exception.S b/sys/sparc64/sparc64/mp_exception.S index 7cc96c5..f6964c8 100644 --- a/sys/sparc64/sparc64/mp_exception.S +++ b/sys/sparc64/sparc64/mp_exception.S @@ -141,7 +141,7 @@ ENTRY(tl_ipi_level) mov 1, %g1 sllx %g1, %g5, %g1 - wr %g1, 0, %asr20 + wr %g1, 0, %set_softint retry END(tl_ipi_level) |
