osdyson
/
illumos-packaging
mirror of https://git.osdyson.ru/illumos/illumos-packaging.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
illumos-packaging/uts/debian/patches/uts-assembler-macro.patch

1719 lines
54 KiB
Diff
Raw Permalink Blame History

Index: b/usr/src/uts/intel/kdi/kdi_idthdl.s
===================================================================
--- a/usr/src/uts/intel/kdi/kdi_idthdl.s 2014-03-01 22:52:24.639479067 +0400
+++ b/usr/src/uts/intel/kdi/kdi_idthdl.s 2014-03-01 22:54:10.749025430 +0400
@@ -100,28 +100,28 @@
#define MKIVCT(n) \
- ENTRY_NP(kdi_ivct/**/n/**/); \
+ ENTRY_NP(kdi_ivct##n##); \
TRAP_ERR(n); \
.align KDI_MSR_PATCHOFF; \
KDI_MSR_PATCH; \
jmp kdi_cmnint; \
- SET_SIZE(kdi_ivct/**/n/**/)
+ SET_SIZE(kdi_ivct##n##)
#define MKTRAPHDLR(n) \
- ENTRY_NP(kdi_trap/**/n); \
+ ENTRY_NP(kdi_trap##n); \
TRAP_ERR(n); \
.align KDI_MSR_PATCHOFF; \
KDI_MSR_PATCH; \
jmp kdi_cmnint; \
- SET_SIZE(kdi_trap/**/n/**/)
+ SET_SIZE(kdi_trap##n##)
#define MKTRAPERRHDLR(n) \
- ENTRY_NP(kdi_traperr/**/n); \
+ ENTRY_NP(kdi_traperr##n); \
TRAP_NOERR(n); \
.align KDI_MSR_PATCHOFF; \
KDI_MSR_PATCH; \
jmp kdi_cmnint; \
- SET_SIZE(kdi_traperr/**/n)
+ SET_SIZE(kdi_traperr##n)
#define MKNMIHDLR \
ENTRY_NP(kdi_int2); \
Index: b/usr/src/uts/intel/ia32/ml/copy.s
===================================================================
--- a/usr/src/uts/intel/ia32/ml/copy.s 2014-03-01 22:52:24.639432460 +0400
+++ b/usr/src/uts/intel/ia32/ml/copy.s 2014-03-01 22:54:10.754114186 +0400
@@ -377,7 +377,7 @@
*/
ALTENTRY(bcopy_altentry)
do_copy:
-#define L(s) .bcopy/**/s
+#define L(s) .bcopy##s
cmpq $0x50, %rdx /* 80 */
jge bcopy_ck_size
@@ -1063,7 +1063,7 @@
#endif
ALTENTRY(bzero_altentry)
do_zero:
-#define L(s) .bzero/**/s
+#define L(s) .bzero##s
xorl %eax, %eax
cmpq $0x50, %rsi /* 80 */
@@ -2415,14 +2415,14 @@
movq %gs:CPU_THREAD, %r9; \
cmpq kernelbase(%rip), %rdi; \
jae 1f; \
- leaq _flt_/**/NAME, %rdx; \
+ leaq _flt_##NAME, %rdx; \
movq %rdx, T_LOFAULT(%r9); \
INSTR (%rdi), REG; \
movq $0, T_LOFAULT(%r9); \
INSTR REG, (%rsi); \
xorl %eax, %eax; \
ret; \
-_flt_/**/NAME: \
+_flt_##NAME: \
movq $0, T_LOFAULT(%r9); \
1: \
movq T_COPYOPS(%r9), %rax; \
@@ -2447,7 +2447,7 @@
movl kernelbase, %eax; \
cmpl %eax, 4(%esp); \
jae 1f; \
- lea _flt_/**/NAME, %edx; \
+ lea _flt_##NAME, %edx; \
movl %edx, T_LOFAULT(%ecx); \
movl 4(%esp), %eax; \
movl 8(%esp), %edx; \
@@ -2456,7 +2456,7 @@
INSTR REG, (%edx); \
xorl %eax, %eax; \
ret; \
-_flt_/**/NAME: \
+_flt_##NAME: \
movl $0, T_LOFAULT(%ecx); \
1: \
movl T_COPYOPS(%ecx), %eax; \
@@ -2522,13 +2522,13 @@
movq %gs:CPU_THREAD, %r9; \
cmpq kernelbase(%rip), %rdi; \
jae 1f; \
- leaq _flt_/**/NAME, %rdx; \
+ leaq _flt_##NAME, %rdx; \
movq %rdx, T_LOFAULT(%r9); \
INSTR REG, (%rdi); \
movq $0, T_LOFAULT(%r9); \
xorl %eax, %eax; \
ret; \
-_flt_/**/NAME: \
+_flt_##NAME: \
movq $0, T_LOFAULT(%r9); \
1: \
movq T_COPYOPS(%r9), %rax; \
@@ -2553,7 +2553,7 @@
movl kernelbase, %eax; \
cmpl %eax, 4(%esp); \
jae 1f; \
- lea _flt_/**/NAME, %edx; \
+ lea _flt_##NAME, %edx; \
movl %edx, T_LOFAULT(%ecx); \
movl 4(%esp), %eax; \
movl 8(%esp), %edx; \
@@ -2561,7 +2561,7 @@
movl $0, T_LOFAULT(%ecx); \
xorl %eax, %eax; \
ret; \
-_flt_/**/NAME: \
+_flt_##NAME: \
movl $0, T_LOFAULT(%ecx); \
1: \
movl T_COPYOPS(%ecx), %eax; \
Index: b/usr/src/uts/intel/ia32/ml/exception.s
===================================================================
--- a/usr/src/uts/intel/ia32/ml/exception.s 2014-03-01 22:52:24.639311963 +0400
+++ b/usr/src/uts/intel/ia32/ml/exception.s 2014-03-01 22:54:10.757527550 +0400
@@ -1295,11 +1295,11 @@
* Interrupts start at 32
*/
#define MKIVCT(n) \
- ENTRY_NP(ivct/**/n) \
+ ENTRY_NP(ivct##n) \
push $0; \
push $n - 0x20; \
jmp cmnint; \
- SET_SIZE(ivct/**/n)
+ SET_SIZE(ivct##n)
MKIVCT(32)
MKIVCT(33)
Index: b/usr/src/uts/intel/ia32/ml/i86_subr.s
===================================================================
--- a/usr/src/uts/intel/ia32/ml/i86_subr.s 2014-03-01 22:52:24.639389397 +0400
+++ b/usr/src/uts/intel/ia32/ml/i86_subr.s 2014-03-01 22:54:10.761498822 +0400
@@ -1162,23 +1162,23 @@
#if defined(__amd64)
#define SETPRI(level) \
- movl $/**/level, %edi; /* new priority */ \
+ movl $##level, %edi; /* new priority */ \
jmp do_splx /* redirect to do_splx */
#define RAISE(level) \
- movl $/**/level, %edi; /* new priority */ \
+ movl $##level, %edi; /* new priority */ \
jmp splr /* redirect to splr */
#elif defined(__i386)
#define SETPRI(level) \
- pushl $/**/level; /* new priority */ \
+ pushl $##level; /* new priority */ \
call do_splx; /* invoke common splx code */ \
addl $4, %esp; /* unstack arg */ \
ret
#define RAISE(level) \
- pushl $/**/level; /* new priority */ \
+ pushl $##level; /* new priority */ \
call splr; /* invoke common splr code */ \
addl $4, %esp; /* unstack args */ \
ret
Index: b/usr/src/uts/intel/ia32/ml/modstubs.s
===================================================================
--- a/usr/src/uts/intel/ia32/ml/modstubs.s 2014-03-01 22:52:24.639352189 +0400
+++ b/usr/src/uts/intel/ia32/ml/modstubs.s 2014-03-01 22:54:10.765502469 +0400
@@ -99,14 +99,14 @@
*/
#define MODULE(module,namespace) \
.data; \
-module/**/_modname: \
- .string "namespace/module"; \
- SET_SIZE(module/**/_modname); \
+module##_modname: \
+ .ascii #namespace, "/", #module, "\0"; \
+ SET_SIZE(module##_modname); \
.align CPTRSIZE; \
- .globl module/**/_modinfo; \
- .type module/**/_modinfo, @object; \
-module/**/_modinfo: \
- .quad module/**/_modname; \
+ .globl module##_modinfo; \
+ .type module##_modinfo, @object; \
+module##_modinfo: \
+ .quad module##_modname; \
.quad 0 /* storage for modctl pointer */
/* then mod_stub_info structures follow until a mods_func_adr is 0 */
@@ -116,7 +116,7 @@
.data; \
.align CPTRSIZE; \
.quad 0; \
- SET_SIZE(module/**/_modinfo)
+ SET_SIZE(module##_modinfo)
/*
* The data section in the stub_common macro is the
@@ -125,7 +125,7 @@
#define STUB_COMMON(module, fcnname, install_fcn, retfcn, weak) \
ENTRY(fcnname); \
- leaq fcnname/**/_info(%rip), %rax; \
+ leaq fcnname##_info(%rip), %rax; \
cmpl $0, MODS_FLAG(%rax); /* weak? */ \
je stubs_common_code; /* not weak */ \
testb $MODS_INSTALLED, MODS_FLAG(%rax); /* installed? */ \
@@ -134,18 +134,18 @@
SET_SIZE(fcnname); \
.data; \
.align CPTRSIZE; \
- .type fcnname/**/_info, @object; \
-fcnname/**/_info: \
+ .type fcnname##_info, @object; \
+fcnname##_info: \
.quad install_fcn; /* 0 */ \
- .quad module/**/_modinfo; /* 0x8 */ \
+ .quad module##_modinfo; /* 0x8 */ \
.quad fcnname; /* 0x10 */ \
.quad retfcn; /* 0x18 */ \
.long weak; /* 0x20 */ \
- SET_SIZE(fcnname/**/_info)
+ SET_SIZE(fcnname##_info)
#define STUB_UNLOADABLE(module, fcnname, install_fcn, retfcn, weak) \
ENTRY(fcnname); \
- leaq fcnname/**/_info(%rip), %rax; \
+ leaq fcnname##_info(%rip), %rax; \
testb $MODS_INSTALLED, MODS_FLAG(%rax); /* installed? */ \
je 5f; /* no */ \
jmp *(%rax); /* yes, jump to install_fcn */ \
@@ -155,14 +155,14 @@
SET_SIZE(fcnname); \
.data; \
.align CPTRSIZE; \
- .type fcnname/**/_info, @object; \
-fcnname/**/_info: \
+ .type fcnname##_info, @object; \
+fcnname##_info: \
.quad install_fcn; /* 0 */ \
- .quad module/**/_modinfo; /* 0x8 */ \
+ .quad module##_modinfo; /* 0x8 */ \
.quad fcnname; /* 0x10 */ \
.quad retfcn; /* 0x18 */ \
.long weak; /* 0x20 */ \
- SET_SIZE(fcnname/**/_info)
+ SET_SIZE(fcnname##_info)
/*
* We branch here with the fcnname_info pointer in %rax
@@ -241,14 +241,14 @@
*/
#define MODULE(module,namespace) \
.data; \
-module/**/_modname: \
- .string "namespace/module"; \
- SET_SIZE(module/**/_modname); \
+module##_modname: \
+ .ascii #namespace, "/", #module, "\0"; \
+ SET_SIZE(module##_modname); \
.align CPTRSIZE; \
- .globl module/**/_modinfo; \
- .type module/**/_modinfo, @object; \
-module/**/_modinfo: \
- .long module/**/_modname; \
+ .globl module##_modinfo; \
+ .type module##_modinfo, @object; \
+module##_modinfo: \
+ .long module##_modname; \
.long 0 /* storage for modctl pointer */
/* then mod_stub_info structures follow until a mods_func_adr is 0 */
@@ -258,7 +258,7 @@
.data; \
.align CPTRSIZE; \
.long 0; \
- SET_SIZE(module/**/_modinfo)
+ SET_SIZE(module##_modinfo)
/*
* The data section in the stub_common macro is the
@@ -276,7 +276,7 @@
#define STUB_COMMON(module, fcnname, install_fcn, retfcn, weak) \
ENTRY(fcnname); \
- leal fcnname/**/_info, %eax; \
+ leal fcnname##_info, %eax; \
cmpl $0, MODS_FLAG(%eax); /* weak? */ \
je stubs_common_code; /* not weak */ \
testb $MODS_INSTALLED, MODS_FLAG(%eax); /* installed? */ \
@@ -285,18 +285,18 @@
SET_SIZE(fcnname); \
.data; \
.align CPTRSIZE; \
- .type fcnname/**/_info, @object; \
-fcnname/**/_info: \
+ .type fcnname##_info, @object; \
+fcnname##_info: \
.long install_fcn; \
- .long module/**/_modinfo; \
+ .long module##_modinfo; \
.long fcnname; \
.long retfcn; \
.long weak; \
- SET_SIZE(fcnname/**/_info)
+ SET_SIZE(fcnname##_info)
#define STUB_UNLOADABLE(module, fcnname, install_fcn, retfcn, weak) \
ENTRY(fcnname); \
- leal fcnname/**/_info, %eax; \
+ leal fcnname##_info, %eax; \
testb $MODS_INSTALLED, MODS_FLAG(%eax); /* installed? */ \
je 5f; /* no */ \
jmp *(%eax); /* yes, just jump to install_fcn */ \
@@ -306,14 +306,14 @@
SET_SIZE(fcnname); \
.data; \
.align CPTRSIZE; \
- .type fcnname/**/_info, @object; \
-fcnname/**/_info: \
+ .type fcnname##_info, @object; \
+fcnname##_info: \
.long install_fcn; /* 0 */ \
- .long module/**/_modinfo; /* 0x4 */ \
+ .long module##_modinfo; /* 0x4 */ \
.long fcnname; /* 0x8 */ \
.long retfcn; /* 0xc */ \
.long weak; /* 0x10 */ \
- SET_SIZE(fcnname/**/_info)
+ SET_SIZE(fcnname##_info)
/*
* We branch here with the fcnname_info pointer in %eax
Index: b/usr/src/uts/sfmmu/ml/sfmmu_asm.s
===================================================================
--- a/usr/src/uts/sfmmu/ml/sfmmu_asm.s 2014-03-01 22:52:24.639518400 +0400
+++ b/usr/src/uts/sfmmu/ml/sfmmu_asm.s 2014-03-01 22:54:10.775385785 +0400
@@ -331,7 +331,7 @@
srlx tagaccess, MMU_PAGESHIFT4M, tagaccess ;\
srlx tte, TTE_SZ_SHFT, tmp /* isolate the */ ;\
andcc tmp, TTE_SZ_BITS, %g0 /* tte_size bits */ ;\
- bz,a,pt %icc, label/**/f /* if 0, is */ ;\
+ bz,a,pt %icc, label##f /* if 0, is */ ;\
and tagaccess, 0x7, tagaccess /* 32M page size */ ;\
and tagaccess, 0x3f, tagaccess /* else 256M page size */ ;\
label: ;\
@@ -413,38 +413,38 @@
#define TSB_INVALIDATE(tsbep, tag, tmp1, tmp2, tmp3, label) \
lda [tsbep]ASI_MEM, tmp1 /* tmp1 = tsbe tag */ ;\
sethi %hi(TSBTAG_LOCKED), tmp2 ;\
-label/**/1: ;\
+label##1: ;\
cmp tmp1, tmp2 /* see if tsbe is locked, if */ ;\
- be,a,pn %icc, label/**/1 /* so, loop until unlocked */ ;\
+ be,a,pn %icc, label##1 /* so, loop until unlocked */ ;\
lda [tsbep]ASI_MEM, tmp1 /* reloading value each time */ ;\
ldxa [tsbep]ASI_MEM, tmp3 /* tmp3 = tsbe tag */ ;\
cmp tag, tmp3 /* compare tags */ ;\
- bne,pt %xcc, label/**/2 /* if different, do nothing */ ;\
+ bne,pt %xcc, label##2 /* if different, do nothing */ ;\
sethi %hi(TSBTAG_INVALID), tmp3 ;\
casa [tsbep]ASI_MEM, tmp1, tmp3 /* try to set tag invalid */ ;\
cmp tmp1, tmp3 /* if not successful */ ;\
- bne,a,pn %icc, label/**/1 /* start over from the top */ ;\
+ bne,a,pn %icc, label##1 /* start over from the top */ ;\
lda [tsbep]ASI_MEM, tmp1 /* reloading tsbe tag */ ;\
-label/**/2:
+label##2:
#else /* UTSB_PHYS */
#define TSB_INVALIDATE(tsbep, tag, tmp1, tmp2, tmp3, label) \
lda [tsbep]%asi, tmp1 /* tmp1 = tsbe tag */ ;\
sethi %hi(TSBTAG_LOCKED), tmp2 ;\
-label/**/1: ;\
+label##1: ;\
cmp tmp1, tmp2 /* see if tsbe is locked, if */ ;\
- be,a,pn %icc, label/**/1 /* so, loop until unlocked */ ;\
+ be,a,pn %icc, label##1 /* so, loop until unlocked */ ;\
lda [tsbep]%asi, tmp1 /* reloading value each time */ ;\
ldxa [tsbep]%asi, tmp3 /* tmp3 = tsbe tag */ ;\
cmp tag, tmp3 /* compare tags */ ;\
- bne,pt %xcc, label/**/2 /* if different, do nothing */ ;\
+ bne,pt %xcc, label##2 /* if different, do nothing */ ;\
sethi %hi(TSBTAG_INVALID), tmp3 ;\
casa [tsbep]%asi, tmp1, tmp3 /* try to set tag invalid */ ;\
cmp tmp1, tmp3 /* if not successful */ ;\
- bne,a,pn %icc, label/**/1 /* start over from the top */ ;\
+ bne,a,pn %icc, label##1 /* start over from the top */ ;\
lda [tsbep]%asi, tmp1 /* reloading tsbe tag */ ;\
-label/**/2:
+label##2:
#endif /* UTSB_PHYS */
@@ -2016,13 +2016,13 @@
#define ISM_CHECK(tagacc, tsbmiss, ismseg, ismhat, tmp1, tmp2, tmp3 \
label, ismhit) \
ldx [tsbmiss + TSBMISS_ISMBLKPA], tmp1 /* tmp1 = &ismblk */ ;\
- brlz,pt tmp1, label/**/3 /* exit if -1 */ ;\
+ brlz,pt tmp1, label##3 /* exit if -1 */ ;\
add tmp1, IBLK_MAPS, ismhat /* ismhat = &ismblk.map[0] */ ;\
-label/**/1: ;\
+label##1: ;\
ldxa [ismhat]ASI_MEM, ismseg /* ismblk.map[0].ism_seg */ ;\
mov tmp1, tmp3 /* update current ismblkpa head */ ;\
-label/**/2: ;\
- brz,pt ismseg, label/**/3 /* no mapping */ ;\
+label##2: ;\
+ brz,pt ismseg, label##3 /* no mapping */ ;\
add ismhat, IMAP_VB_SHIFT, tmp1 /* tmp1 = vb_shift addr */ ;\
lduba [tmp1]ASI_MEM, tmp1 /* tmp1 = vb shift*/ ;\
srlx ismseg, tmp1, tmp2 /* tmp2 = vbase */ ;\
@@ -2038,14 +2038,14 @@
add ismhat, ISM_MAP_SZ, ismhat /* ismhat += sizeof(map) */ ;\
add tmp3, (IBLK_MAPS + ISM_MAP_SLOTS * ISM_MAP_SZ), tmp1 ;\
cmp ismhat, tmp1 ;\
- bl,pt %xcc, label/**/2 /* keep looking */ ;\
+ bl,pt %xcc, label##2 /* keep looking */ ;\
ldxa [ismhat]ASI_MEM, ismseg /* ismseg = map[ismhat] */ ;\
;\
add tmp3, IBLK_NEXTPA, tmp1 ;\
ldxa [tmp1]ASI_MEM, tmp1 /* check blk->nextpa */ ;\
- brgez,pt tmp1, label/**/1 /* continue if not -1*/ ;\
+ brgez,pt tmp1, label##1 /* continue if not -1*/ ;\
add tmp1, IBLK_MAPS, ismhat /* ismhat = &ismblk.map[0]*/ ;\
-label/**/3:
+label##3:
/*
* Returns the hme hash bucket (hmebp) given the vaddr, and the hatid
@@ -2063,14 +2063,14 @@
#define HMEHASH_FUNC_ASM(tagacc, hatid, tsbarea, hmeshift, hmebp, \
vapg, label, tmp1, tmp2) \
sllx tagacc, TAGACC_CTX_LSHIFT, tmp1 ;\
- brnz,a,pt tmp1, label/**/1 ;\
+ brnz,a,pt tmp1, label##1 ;\
ld [tsbarea + TSBMISS_UHASHSZ], hmebp ;\
ld [tsbarea + TSBMISS_KHASHSZ], hmebp ;\
- ba,pt %xcc, label/**/2 ;\
+ ba,pt %xcc, label##2 ;\
ldx [tsbarea + TSBMISS_KHASHSTART], tmp1 ;\
-label/**/1: ;\
+label##1: ;\
ldx [tsbarea + TSBMISS_UHASHSTART], tmp1 ;\
-label/**/2: ;\
+label##2: ;\
srlx tagacc, hmeshift, vapg ;\
xor vapg, hatid, tmp2 /* hatid ^ (vaddr >> shift) */ ;\
and tmp2, hmebp, hmebp /* index into hme_hash */ ;\
@@ -2106,9 +2106,9 @@
add hmebp, HMEBUCK_NEXTPA, hmeblkpa ;\
ldxa [hmeblkpa]ASI_MEM, hmeblkpa ;\
HAT_HSEARCH_DBSTAT(hatid, tsbarea, hmebp, tmp1) ;\
-label/**/1: ;\
+label##1: ;\
cmp hmeblkpa, HMEBLK_ENDPA ;\
- be,pn %xcc, label/**/2 ;\
+ be,pn %xcc, label##2 ;\
HAT_HLINK_DBSTAT(hatid, tsbarea, hmebp, tmp1) ;\
add hmeblkpa, HMEBLK_TAG, hmebp ;\
ldxa [hmebp]ASI_MEM, tmp1 /* read 1st part of tag */ ;\
@@ -2117,11 +2117,11 @@
xor tmp1, hmeblktag, tmp1 ;\
xor hmebp, hatid, hmebp ;\
or hmebp, tmp1, hmebp ;\
- brz,pn hmebp, label/**/2 /* branch on hit */ ;\
+ brz,pn hmebp, label##2 /* branch on hit */ ;\
add hmeblkpa, HMEBLK_NEXTPA, hmebp ;\
- ba,pt %xcc, label/**/1 ;\
+ ba,pt %xcc, label##1 ;\
ldxa [hmebp]ASI_MEM, hmeblkpa /* hmeblk ptr pa */ ;\
-label/**/2:
+label##2:
/*
* Function to traverse hmeblk hash link list and find corresponding match.
@@ -2139,9 +2139,9 @@
#define HMEHASH_SEARCH_SHME(hmeblktag, hatid, hmeblkpa, tsbarea, \
tmp1, tmp2, label) \
-label/**/1: ;\
+label##1: ;\
cmp hmeblkpa, HMEBLK_ENDPA ;\
- be,pn %xcc, label/**/4 ;\
+ be,pn %xcc, label##4 ;\
HAT_HLINK_DBSTAT(hatid, tsbarea, tmp1, tmp2) ;\
add hmeblkpa, HMEBLK_TAG, tmp2 ;\
ldxa [tmp2]ASI_MEM, tmp1 /* read 1st part of tag */ ;\
@@ -2149,14 +2149,14 @@
ldxa [tmp2]ASI_MEM, tmp2 /* read 2nd part of tag */ ;\
xor tmp1, hmeblktag, tmp1 ;\
xor tmp2, hatid, tmp2 ;\
- brz,pn tmp2, label/**/3 /* branch on hit */ ;\
+ brz,pn tmp2, label##3 /* branch on hit */ ;\
add hmeblkpa, HMEBLK_NEXTPA, tmp2 ;\
-label/**/2: ;\
- ba,pt %xcc, label/**/1 ;\
+label##2: ;\
+ ba,pt %xcc, label##1 ;\
ldxa [tmp2]ASI_MEM, hmeblkpa /* hmeblk ptr pa */ ;\
-label/**/3: ;\
+label##3: ;\
cmp tmp1, SFMMU_MAX_HME_REGIONS ;\
- bgeu,pt %xcc, label/**/2 ;\
+ bgeu,pt %xcc, label##2 ;\
add hmeblkpa, HMEBLK_NEXTPA, tmp2 ;\
and tmp1, BT_ULMASK, tmp2 ;\
srlx tmp1, BT_ULSHIFT, tmp1 ;\
@@ -2165,9 +2165,9 @@
ldx [tmp1 + TSBMISS_SHMERMAP], tmp1 ;\
srlx tmp1, tmp2, tmp1 ;\
btst 0x1, tmp1 ;\
- bz,pn %xcc, label/**/2 ;\
+ bz,pn %xcc, label##2 ;\
add hmeblkpa, HMEBLK_NEXTPA, tmp2 ;\
-label/**/4:
+label##4:
#if ((1 << SFHME_SHIFT) != SFHME_SIZE)
#error HMEBLK_TO_HMENT assumes sf_hment is power of 2 in size
@@ -2223,7 +2223,7 @@
stn tagacc, [tsbarea + (TSBMISS_SCRATCH + TSB_TAGACC)] ;\
stn hatid, [tsbarea + (TSBMISS_SCRATCH + TSBMISS_HATID)] ;\
HMEHASH_FUNC_ASM(tagacc, hatid, tsbarea, hmeshift, tte, \
- hmeblkpa, label/**/5, hmemisc, tmp) ;\
+ hmeblkpa, label##5, hmemisc, tmp) ;\
;\
/* ;\
* tagacc = tagacc ;\
@@ -2246,7 +2246,7 @@
*/ ;\
stn tte, [tsbarea + (TSBMISS_SCRATCH + TSBMISS_HMEBP)] ;\
HMEHASH_SEARCH(tte, hmemisc, hatid, hmeblkpa, \
- tsbarea, tagacc, label/**/1) ;\
+ tsbarea, tagacc, label##1) ;\
/* ;\
* tagacc = CLOBBERED ;\
* tte = CLOBBERED ;\
@@ -2254,11 +2254,11 @@
* tmp = scratch ;\
*/ ;\
cmp hmeblkpa, HMEBLK_ENDPA ;\
- bne,pn %xcc, label/**/4 /* branch if hmeblk found */ ;\
+ bne,pn %xcc, label##4 /* branch if hmeblk found */ ;\
ldn [tsbarea + (TSBMISS_SCRATCH + TSB_TAGACC)], tagacc ;\
ba,pt %xcc, exitlabel /* exit if hblk not found */ ;\
nop ;\
-label/**/4: ;\
+label##4: ;\
/* ;\
* We have found the hmeblk containing the hment. ;\
* Now we calculate the corresponding tte. ;\
@@ -2271,7 +2271,7 @@
* tmp = scratch ;\
*/ ;\
HMEBLK_TO_HMENT(tagacc, hmeblkpa, hatid, hmemisc, tte, \
- label/**/2) ;\
+ label##2) ;\
;\
/* ;\
* tagacc = tagacc ;\
@@ -2311,7 +2311,7 @@
stn tagacc, [tsbarea + (TSBMISS_SCRATCH + TSB_TAGACC)] ;\
stn hatid, [tsbarea + (TSBMISS_SCRATCH + TSBMISS_HATID)] ;\
HMEHASH_FUNC_ASM(tagacc, hatid, tsbarea, hmeshift, tte, \
- hmeblkpa, label/**/5, hmemisc, tmp) ;\
+ hmeblkpa, label##5, hmemisc, tmp) ;\
;\
/* ;\
* tagacc = tagacc ;\
@@ -2338,9 +2338,9 @@
ldxa [hmeblkpa]ASI_MEM, hmeblkpa ;\
HAT_HSEARCH_DBSTAT(hatid, tsbarea, tagacc, tte) ;\
;\
-label/**/8: ;\
+label##8: ;\
HMEHASH_SEARCH_SHME(hmemisc, hatid, hmeblkpa, \
- tsbarea, tagacc, tte, label/**/1) ;\
+ tsbarea, tagacc, tte, label##1) ;\
/* ;\
* tagacc = CLOBBERED ;\
* tte = CLOBBERED ;\
@@ -2348,11 +2348,11 @@
* tmp = scratch ;\
*/ ;\
cmp hmeblkpa, HMEBLK_ENDPA ;\
- bne,pn %xcc, label/**/4 /* branch if hmeblk found */ ;\
+ bne,pn %xcc, label##4 /* branch if hmeblk found */ ;\
ldn [tsbarea + (TSBMISS_SCRATCH + TSB_TAGACC)], tagacc ;\
ba,pt %xcc, exitlabel /* exit if hblk not found */ ;\
nop ;\
-label/**/4: ;\
+label##4: ;\
/* ;\
* We have found the hmeblk containing the hment. ;\
* Now we calculate the corresponding tte. ;\
@@ -2366,7 +2366,7 @@
* tmp = scratch ;\
*/ ;\
HMEBLK_TO_HMENT(tagacc, hmeblkpa, hatid, hmemisc, tte, \
- label/**/2) ;\
+ label##2) ;\
;\
/* ;\
* tagacc = tagacc ;\
@@ -2381,10 +2381,10 @@
add hatid, SFHME_TTE, hatid ;\
add hmeblkpa, hatid, hmeblkpa ;\
ldxa [hmeblkpa]ASI_MEM, tte /* MMU_READTTE through pa */ ;\
- brlz,pt tte, label/**/6 ;\
+ brlz,pt tte, label##6 ;\
nop ;\
btst HBLK_SZMASK, hmemisc ;\
- bnz,a,pt %icc, label/**/7 ;\
+ bnz,a,pt %icc, label##7 ;\
ldn [tsbarea + (TSBMISS_SCRATCH + TSBMISS_HMEBP)], hatid ;\
;\
/* ;\
@@ -2399,11 +2399,11 @@
add hmeblkpa, HMEBLK_NEXTPA, hmeblkpa ;\
ldxa [hmeblkpa]ASI_MEM, hmeblkpa ;\
MAKE_HASHTAG(tte, hatid, hmeshift, hashno, hmemisc) ;\
- ba,a,pt %xcc, label/**/8 ;\
-label/**/6: ;\
+ ba,a,pt %xcc, label##8 ;\
+label##6: ;\
GET_SCDSHMERMAP(tsbarea, hmeblkpa, hatid, hmemisc) ;\
ldn [tsbarea + (TSBMISS_SCRATCH + TSBMISS_HMEBP)], hatid ;\
-label/**/7: ;\
+label##7: ;\
set TTE_SUSPEND, hatid ;\
TTE_SUSPEND_INT_SHIFT(hatid) ;\
btst tte, hatid ;\
@@ -4157,38 +4157,38 @@
add tmp1, mseg, tmp1 ;\
ldxa [tmp1]%asi, mseg ;\
cmp mseg, MSEG_NULLPTR_PA ;\
- be,pn %xcc, label/**/1 /* if not found */ ;\
+ be,pn %xcc, label##1 /* if not found */ ;\
nop ;\
ldxa [mseg + MEMSEG_PAGES_BASE]%asi, tmp1 ;\
cmp pfn, tmp1 /* pfn - pages_base */ ;\
- blu,pn %xcc, label/**/1 ;\
+ blu,pn %xcc, label##1 ;\
ldxa [mseg + MEMSEG_PAGES_END]%asi, tmp2 ;\
cmp pfn, tmp2 /* pfn - pages_end */ ;\
- bgeu,pn %xcc, label/**/1 ;\
+ bgeu,pn %xcc, label##1 ;\
sub pfn, tmp1, tmp1 /* pfn - pages_base */ ;\
mulx tmp1, PAGE_SIZE, tmp1 ;\
ldxa [mseg + MEMSEG_PAGESPA]%asi, tmp2 /* pages */ ;\
add tmp2, tmp1, tmp1 /* pp */ ;\
lduwa [tmp1 + PAGE_PAGENUM]%asi, tmp2 ;\
cmp tmp2, pfn ;\
- be,pt %xcc, label/**/_ok /* found */ ;\
-label/**/1: ;\
+ be,pt %xcc, label##_ok /* found */ ;\
+label##1: ;\
/* brute force lookup */ ;\
sethi %hi(memsegspa), tmp3 /* no tsbmp use due to DR */ ;\
ldx [tmp3 + %lo(memsegspa)], mseg ;\
-label/**/2: ;\
+label##2: ;\
cmp mseg, MSEG_NULLPTR_PA ;\
- be,pn %xcc, label/**/_ok /* if not found */ ;\
+ be,pn %xcc, label##_ok /* if not found */ ;\
nop ;\
ldxa [mseg + MEMSEG_PAGES_BASE]%asi, tmp1 ;\
cmp pfn, tmp1 /* pfn - pages_base */ ;\
- blu,a,pt %xcc, label/**/2 ;\
+ blu,a,pt %xcc, label##2 ;\
ldxa [mseg + MEMSEG_NEXTPA]%asi, mseg ;\
ldxa [mseg + MEMSEG_PAGES_END]%asi, tmp2 ;\
cmp pfn, tmp2 /* pfn - pages_end */ ;\
- bgeu,a,pt %xcc, label/**/2 ;\
+ bgeu,a,pt %xcc, label##2 ;\
ldxa [mseg + MEMSEG_NEXTPA]%asi, mseg ;\
-label/**/_ok:
+label##_ok:
/*
* kpm tsb miss handler large pages
Index: b/usr/src/uts/sparc/ml/modstubs.s
===================================================================
--- a/usr/src/uts/sparc/ml/modstubs.s 2014-03-01 22:52:24.639171916 +0400
+++ b/usr/src/uts/sparc/ml/modstubs.s 2014-03-01 22:54:10.779345292 +0400
@@ -86,16 +86,16 @@
*/
#define MODULE(module,namespace) \
.seg ".data"; \
-module/**/_modname: \
+module##_modname: \
.ascii "namespace/module"; \
.byte 0; \
.align CPTRSIZE; \
- .global module/**/_modinfo; \
- .type module/**/_modinfo, #object; \
- .size module/**/_modinfo, 16; \
-module/**/_modinfo: \
+ .global module##_modinfo; \
+ .type module##_modinfo, #object; \
+ .size module##_modinfo, 16; \
+module##_modinfo: \
.word 0; \
- .word module/**/_modname; \
+ .word module##_modname; \
.word 0; \
.word 0;
@@ -136,11 +136,11 @@
#define STUB_DATA(module, fcnname, install_fcn, retfcn, weak) \
.seg ".data"; \
.align 8; \
-fcnname/**/_info: \
+fcnname##_info: \
.word 0; /* 0 */ \
.word install_fcn; /* 4 */ \
.word 0; /* 8 */ \
- .word module/**/_modinfo; /* c */ \
+ .word module##_modinfo; /* c */ \
.word 0; /* 10 */ \
.word fcnname; /* 14 */ \
.word 0; /* 18 */ \
@@ -159,7 +159,7 @@
#define STUB_COMMON(module, fcnname, install_fcn, retfcn, weak) \
ENTRY_NP(fcnname); \
save %sp, -SA(MINFRAME), %sp;/* new window */ \
- set fcnname/**/_info, %l5; \
+ set fcnname##_info, %l5; \
ld [%l5 + MODS_FLAG], %l1; /* weak?? */ \
cmp %l1, 0; \
be,a 1f; /* not weak */ \
@@ -173,16 +173,16 @@
1: sub %sp, %fp, %g1; /* get (-)size of callers stack */ \
save %sp, %g1, %sp; /* create new frame same size */ \
sub %g0, %g1, %l4; /* size of stack frame */ \
- sethi %hi(fcnname/**/_info), %l5; \
+ sethi %hi(fcnname##_info), %l5; \
b stubs_common_code; \
- or %l5, %lo(fcnname/**/_info), %l5; \
+ or %l5, %lo(fcnname##_info), %l5; \
SET_SIZE(fcnname); \
STUB_DATA(module, fcnname, install_fcn, retfcn, weak)
#define STUB_UNLOADABLE(module, fcnname, install_fcn, retfcn, weak) \
ENTRY_NP(fcnname); \
save %sp, -SA(MINFRAME), %sp; /* new window */ \
- set fcnname/**/_info, %l5; \
+ set fcnname##_info, %l5; \
ld [%l5 + MODS_FLAG], %l1; \
btst MODS_INSTALLED, %l1; /* installed?? */ \
bne,a %xcc, 1f; /* yes */ \
@@ -196,16 +196,16 @@
2: sub %sp, %fp, %g1; /* get (-)size of callers frame */ \
save %sp, %g1, %sp; /* create new frame same size */ \
sub %g0, %g1, %l4; /* size of stack frame */ \
- sethi %hi(fcnname/**/_info), %l5; \
+ sethi %hi(fcnname##_info), %l5; \
b stubs_common_code; \
- or %l5, %lo(fcnname/**/_info), %l5; \
+ or %l5, %lo(fcnname##_info), %l5; \
SET_SIZE(fcnname); \
STUB_DATA(module, fcnname, install_fcn, retfcn, weak)
#define SCALL_UNLOADABLE(module, fcnname, install_fcn, retfcn, weak) \
ENTRY_NP(fcnname); \
save %sp, -SA(MINFRAME), %sp; /* new window */ \
- set fcnname/**/_info, %l5; \
+ set fcnname##_info, %l5; \
ld [%l5 + MODS_FLAG], %l1; /* installed?? */ \
btst MODS_INSTALLED, %l1; \
be,a %xcc, 1f; /* no, load module */ \
@@ -215,9 +215,9 @@
restore; \
1: save %sp, -SA(MINFRAME), %sp;/* new frame */ \
sub %g0, -SA(MINFRAME), %l4;/* size of stack frame */ \
- sethi %hi(fcnname/**/_info), %l5; \
+ sethi %hi(fcnname##_info), %l5; \
b stubs_common_code; \
- or %l5, %lo(fcnname/**/_info), %l5; \
+ or %l5, %lo(fcnname##_info), %l5; \
SET_SIZE(fcnname); \
STUB_DATA(module, fcnname, install_fcn, retfcn, weak)
Index: b/usr/src/uts/sparc/v9/ml/ddi_v9_asm.s
===================================================================
--- a/usr/src/uts/sparc/v9/ml/ddi_v9_asm.s 2014-03-01 22:52:24.639274629 +0400
+++ b/usr/src/uts/sparc/v9/ml/ddi_v9_asm.s 2014-03-01 22:54:10.782737588 +0400
@@ -782,9 +782,9 @@
movnz %xcc, n, %o4; \
2: \
dec %o3; \
- ld/**/s [%o2], %g4; \
+ ld##s [%o2], %g4; \
add %o2, %o4, %o2; \
- st/**/s %g4, [%o1]; \
+ st##s %g4, [%o1]; \
brnz,pt %o3, 2b; \
add %o1, n, %o1; \
1:
@@ -847,7 +847,7 @@
.align 16
ENTRY(i_ddi_rep_get32)
ALTENTRY(i_ddi_swap_rep_get32)
- DDI_REP_GET(4,/**/)
+ DDI_REP_GET(4,##)
retl
nop
SET_SIZE(i_ddi_rep_get32)
@@ -891,9 +891,9 @@
movnz %xcc, n, %o4; \
2: \
dec %o3; \
- ld/**/s [%o1], %g4; \
+ ld##s [%o1], %g4; \
add %o1, n, %o1; \
- st/**/s %g4, [%o2]; \
+ st##s %g4, [%o2]; \
brnz,pt %o3, 2b; \
add %o2, %o4, %o2; \
1:
@@ -956,7 +956,7 @@
.align 16
ENTRY(i_ddi_rep_put32)
ALTENTRY(i_ddi_swap_rep_put32)
- DDI_REP_PUT(4,/**/)
+ DDI_REP_PUT(4,##)
retl
nop
SET_SIZE(i_ddi_rep_put32)
@@ -1466,7 +1466,7 @@
tst %o0 ! check access error
bnz,a 1f
nop
- DDI_REP_GET(4,/**/)
+ DDI_REP_GET(4,##)
1:
DDI_NOPROTECT() ! remove protection & ret
retl
@@ -1502,7 +1502,7 @@
.align 16
ENTRY(i_ddi_prot_rep_put32)
- DDI_REP_PUT(4,/**/)
+ DDI_REP_PUT(4,##)
retl
membar #Sync;
SET_SIZE(i_ddi_prot_rep_put32)
Index: b/usr/src/uts/sparc/v9/ml/float.s
===================================================================
--- a/usr/src/uts/sparc/v9/ml/float.s 2014-03-01 22:52:24.639225186 +0400
+++ b/usr/src/uts/sparc/v9/ml/float.s 2014-03-01 22:54:10.785771865 +0400
@@ -252,7 +252,7 @@
jmp %g1 + %o1 ! Jump into table
nop ! Can't follow CTI by CTI.
-#define STOREFP(n) jmp %o7+8 ; st %f/**/n, [%o0]
+#define STOREFP(n) jmp %o7+8 ; st %f##n, [%o0]
.stable:
STOREFP(0)
@@ -288,7 +288,7 @@
STOREFP(30)
STOREFP(31)
-#define LOADFP(n) jmp %o7+8 ; ld [%o0],%f/**/n
+#define LOADFP(n) jmp %o7+8 ; ld [%o0],%f##n
.ltable:
LOADFP(0)
@@ -373,7 +373,7 @@
jmp %g1 + %o1 ! Jump into table
nop ! Can't follow CTI by CTI.
-#define STOREDP(n) jmp %o7+8 ; std %d/**/n, [%o0]
+#define STOREDP(n) jmp %o7+8 ; std %d##n, [%o0]
.dstable:
STOREDP(0)
@@ -409,7 +409,7 @@
STOREDP(60)
STOREDP(62)
-#define LOADDP(n) jmp %o7+8 ; ldd [%o0],%d/**/n
+#define LOADDP(n) jmp %o7+8 ; ldd [%o0],%d##n
.dltable:
LOADDP(0)
Index: b/usr/src/uts/sun4u/cpu/cheetah_copy.s
===================================================================
--- a/usr/src/uts/sun4u/cpu/cheetah_copy.s 2014-03-01 22:52:24.638678299 +0400
+++ b/usr/src/uts/sun4u/cpu/cheetah_copy.s 2014-03-01 22:54:10.790937151 +0400
@@ -700,11 +700,11 @@
#define FP_NOMIGRATE(label1, label2) \
ldn [THREAD_REG + T_LWP], %o0 ;\
- brz,a,pn %o0, label1/**/f ;\
+ brz,a,pn %o0, label1##f ;\
ldsb [THREAD_REG + T_PREEMPT], %o1 ;\
call thread_nomigrate ;\
nop ;\
- ba label2/**/f ;\
+ ba label2##f ;\
nop ;\
label1: ;\
inc %o1 ;\
@@ -713,19 +713,19 @@
#define FP_ALLOWMIGRATE(label1, label2) \
ldn [THREAD_REG + T_LWP], %o0 ;\
- brz,a,pn %o0, label1/**/f ;\
+ brz,a,pn %o0, label1##f ;\
ldsb [THREAD_REG + T_PREEMPT], %o1 ;\
call thread_allowmigrate ;\
nop ;\
- ba label2/**/f ;\
+ ba label2##f ;\
nop ;\
label1: ;\
dec %o1 ;\
- brnz,pn %o1, label2/**/f ;\
+ brnz,pn %o1, label2##f ;\
stb %o1, [THREAD_REG + T_PREEMPT] ;\
ldn [THREAD_REG + T_CPU], %o0 ;\
ldub [%o0 + CPU_KPRUNRUN], %o0 ;\
- brz,pt %o0, label2/**/f ;\
+ brz,pt %o0, label2##f ;\
nop ;\
call kpreempt ;\
rdpr %pil, %o0 ;\
Index: b/usr/src/uts/sun4u/cpu/common_asm.s
===================================================================
--- a/usr/src/uts/sun4u/cpu/common_asm.s 2014-03-01 22:52:24.638600835 +0400
+++ b/usr/src/uts/sun4u/cpu/common_asm.s 2014-03-01 22:54:10.793414162 +0400
@@ -792,21 +792,21 @@
#define BRZPT brz,pt
#define KSTAT_Q_UPDATE(QOP, QBR, QZERO, QRETURN, QTYPE) \
- ld [%o0 + QTYPE/**/CNT], %o1; /* %o1 = old qlen */ \
+ ld [%o0 + QTYPE##CNT], %o1; /* %o1 = old qlen */ \
QOP %o1, 1, %o2; /* %o2 = new qlen */ \
QBR %o1, QZERO; /* done if qlen == 0 */ \
- st %o2, [%o0 + QTYPE/**/CNT]; /* delay: save qlen */ \
- ldx [%o0 + QTYPE/**/LASTUPDATE], %o3; \
- ldx [%o0 + QTYPE/**/TIME], %o4; /* %o4 = old time */ \
- ldx [%o0 + QTYPE/**/LENTIME], %o5; /* %o5 = old lentime */ \
+ st %o2, [%o0 + QTYPE##CNT]; /* delay: save qlen */ \
+ ldx [%o0 + QTYPE##LASTUPDATE], %o3; \
+ ldx [%o0 + QTYPE##TIME], %o4; /* %o4 = old time */ \
+ ldx [%o0 + QTYPE##LENTIME], %o5; /* %o5 = old lentime */ \
sub %g1, %o3, %o2; /* %o2 = time delta */ \
mulx %o1, %o2, %o3; /* %o3 = cur lentime */ \
add %o4, %o2, %o4; /* %o4 = new time */ \
add %o5, %o3, %o5; /* %o5 = new lentime */ \
- stx %o4, [%o0 + QTYPE/**/TIME]; /* save time */ \
- stx %o5, [%o0 + QTYPE/**/LENTIME]; /* save lentime */ \
+ stx %o4, [%o0 + QTYPE##TIME]; /* save time */ \
+ stx %o5, [%o0 + QTYPE##LENTIME]; /* save lentime */ \
QRETURN; \
- stx %g1, [%o0 + QTYPE/**/LASTUPDATE]; /* lastupdate = now */
+ stx %g1, [%o0 + QTYPE##LASTUPDATE]; /* lastupdate = now */
.align 16
ENTRY(kstat_waitq_enter)
Index: b/usr/src/uts/sun4u/cpu/opl_olympus_asm.s
===================================================================
--- a/usr/src/uts/sun4u/cpu/opl_olympus_asm.s 2014-03-01 22:52:24.638718186 +0400
+++ b/usr/src/uts/sun4u/cpu/opl_olympus_asm.s 2014-03-01 22:54:10.796357181 +0400
@@ -625,7 +625,7 @@
add ptr, scr1, scr1; \
ld [scr1 + TRAPTR_LIMIT], ptr; \
tst ptr; \
- be,pn %icc, label/**/1; \
+ be,pn %icc, label##1; \
ldx [scr1 + TRAPTR_PBASE], ptr; \
ld [scr1 + TRAPTR_OFFSET], scr1; \
add ptr, scr1, ptr; \
@@ -660,7 +660,7 @@
cmp scr1, scr2; \
movge %icc, 0, scr1; \
st scr1, [ptr + TRAPTR_OFFSET]; \
-label/**/1:
+label##1:
#endif /* TRAPTRACE */
@@ -930,7 +930,7 @@
mov %g0, %g7 ;\
rdpr %tl, tmp1 ;\
cmp tmp1, 1 ;\
- be,pt %xcc, label/**/1 ;\
+ be,pt %xcc, label##1 ;\
rdpr %pstate, tmp1 ;\
wrpr tmp1, PSTATE_AG|PSTATE_IG, %pstate ;\
CLEAR_GLOBALS() ;\
@@ -939,14 +939,14 @@
CLEAR_GLOBALS() ;\
rdpr %pstate, tmp1 ;\
wrpr tmp1, PSTATE_MG|PSTATE_AG, %pstate ;\
- ba,pt %xcc, label/**/2 ;\
+ ba,pt %xcc, label##2 ;\
nop ;\
-label/**/1: ;\
+label##1: ;\
wrpr tmp1, PSTATE_AG, %pstate ;\
CLEAR_GLOBALS() ;\
rdpr %pstate, tmp1 ;\
wrpr tmp1, PSTATE_AG, %pstate ;\
-label/**/2:
+label##2:
/*
@@ -968,7 +968,7 @@
#define RESET_PREV_TSTATE(tmp1, tmp2, label) \
rdpr %tl, tmp1 ;\
subcc tmp1, 1, tmp1 ;\
- bz,pt %xcc, label/**/1 ;\
+ bz,pt %xcc, label##1 ;\
nop ;\
wrpr tmp1, %g0, %tl ;\
set TSTATE_KERN, tmp2 ;\
@@ -977,7 +977,7 @@
wrpr %g0, %g0, %tnpc ;\
add tmp1, 1, tmp1 ;\
wrpr tmp1, %g0, %tl ;\
-label/**/1:
+label##1:
/*
Index: b/usr/src/uts/sun4u/cpu/opl_olympus_copy.s
===================================================================
--- a/usr/src/uts/sun4u/cpu/opl_olympus_copy.s 2014-03-01 22:52:24.638755718 +0400
+++ b/usr/src/uts/sun4u/cpu/opl_olympus_copy.s 2014-03-01 22:54:10.800522787 +0400
@@ -655,11 +655,11 @@
#define FP_NOMIGRATE(label1, label2) \
ldn [THREAD_REG + T_LWP], %o0 ;\
- brz,a,pn %o0, label1/**/f ;\
+ brz,a,pn %o0, label1##f ;\
ldsb [THREAD_REG + T_PREEMPT], %o1 ;\
call thread_nomigrate ;\
nop ;\
- ba label2/**/f ;\
+ ba label2##f ;\
nop ;\
label1: ;\
inc %o1 ;\
@@ -668,19 +668,19 @@
#define FP_ALLOWMIGRATE(label1, label2) \
ldn [THREAD_REG + T_LWP], %o0 ;\
- brz,a,pn %o0, label1/**/f ;\
+ brz,a,pn %o0, label1##f ;\
ldsb [THREAD_REG + T_PREEMPT], %o1 ;\
call thread_allowmigrate ;\
nop ;\
- ba label2/**/f ;\
+ ba label2##f ;\
nop ;\
label1: ;\
dec %o1 ;\
- brnz,pn %o1, label2/**/f ;\
+ brnz,pn %o1, label2##f ;\
stb %o1, [THREAD_REG + T_PREEMPT] ;\
ldn [THREAD_REG + T_CPU], %o0 ;\
ldub [%o0 + CPU_KPRUNRUN], %o0 ;\
- brz,pt %o0, label2/**/f ;\
+ brz,pt %o0, label2##f ;\
nop ;\
call kpreempt ;\
rdpr %pil, %o0 ;\
Index: b/usr/src/uts/sun4u/cpu/spitfire_asm.s
===================================================================
--- a/usr/src/uts/sun4u/cpu/spitfire_asm.s 2014-03-01 22:52:24.638860722 +0400
+++ b/usr/src/uts/sun4u/cpu/spitfire_asm.s 2014-03-01 22:54:10.803632083 +0400
@@ -221,18 +221,18 @@
ldxa [tmp3]ASI_DMMU, tmp4 ;\
or DEMAP_SECOND | DEMAP_PAGE_TYPE, arg1, arg1 ;\
cmp tmp4, arg2 ;\
- be,a,pt %icc, lbl/**/4 ;\
+ be,a,pt %icc, lbl##4 ;\
nop ;\
stxa arg2, [tmp3]ASI_DMMU ;\
-lbl/**/4: ;\
+lbl##4: ;\
stxa %g0, [arg1]ASI_DTLB_DEMAP ;\
stxa %g0, [arg1]ASI_ITLB_DEMAP ;\
flush tmp2 ;\
- be,a,pt %icc, lbl/**/5 ;\
+ be,a,pt %icc, lbl##5 ;\
nop ;\
stxa tmp4, [tmp3]ASI_DMMU ;\
flush tmp2 ;\
-lbl/**/5: ;\
+lbl##5: ;\
wrpr %g0, tmp1, %pstate
@@ -246,16 +246,16 @@
*/
#define DTLB_FLUSH_UNLOCKED_UCTXS(lbl, arg1, tmp1, tmp2, tmp3, \
tmp4, tmp5, tmp6) \
-lbl/**/0: ;\
+lbl##0: ;\
sllx arg1, 3, tmp3 ;\
SF_WORKAROUND(tmp1, tmp2) ;\
ldxa [tmp3]ASI_DTLB_ACCESS, tmp4 ;\
srlx tmp4, 6, tmp4 ;\
andcc tmp4, 1, %g0 ;\
- bnz,pn %xcc, lbl/**/1 ;\
+ bnz,pn %xcc, lbl##1 ;\
srlx tmp4, 57, tmp4 ;\
andcc tmp4, 1, %g0 ;\
- beq,pn %xcc, lbl/**/1 ;\
+ beq,pn %xcc, lbl##1 ;\
nop ;\
set TAGREAD_CTX_MASK, tmp1 ;\
ldxa [tmp3]ASI_DTLB_TAGREAD, tmp2 ;\
@@ -263,11 +263,11 @@
andn tmp2, tmp1, tmp5 ;\
set KCONTEXT, tmp4 ;\
cmp tmp6, tmp4 ;\
- be lbl/**/1 ;\
+ be lbl##1 ;\
nop ;\
- VTAG_FLUSHUPAGE(VD/**/lbl, tmp5, tmp6, tmp1, tmp2, tmp3, tmp4) ;\
-lbl/**/1: ;\
- brgz,pt arg1, lbl/**/0 ;\
+ VTAG_FLUSHUPAGE(VD##lbl, tmp5, tmp6, tmp1, tmp2, tmp3, tmp4) ;\
+lbl##1: ;\
+ brgz,pt arg1, lbl##0 ;\
sub arg1, 1, arg1
@@ -281,16 +281,16 @@
*/
#define ITLB_FLUSH_UNLOCKED_UCTXS(lbl, arg1, tmp1, tmp2, tmp3, \
tmp4, tmp5, tmp6) \
-lbl/**/0: ;\
+lbl##0: ;\
sllx arg1, 3, tmp3 ;\
SF_WORKAROUND(tmp1, tmp2) ;\
ldxa [tmp3]ASI_ITLB_ACCESS, tmp4 ;\
srlx tmp4, 6, tmp4 ;\
andcc tmp4, 1, %g0 ;\
- bnz,pn %xcc, lbl/**/1 ;\
+ bnz,pn %xcc, lbl##1 ;\
srlx tmp4, 57, tmp4 ;\
andcc tmp4, 1, %g0 ;\
- beq,pn %xcc, lbl/**/1 ;\
+ beq,pn %xcc, lbl##1 ;\
nop ;\
set TAGREAD_CTX_MASK, tmp1 ;\
ldxa [tmp3]ASI_ITLB_TAGREAD, tmp2 ;\
@@ -298,11 +298,11 @@
andn tmp2, tmp1, tmp5 ;\
set KCONTEXT, tmp4 ;\
cmp tmp6, tmp4 ;\
- be lbl/**/1 ;\
+ be lbl##1 ;\
nop ;\
- VTAG_FLUSHUPAGE(VI/**/lbl, tmp5, tmp6, tmp1, tmp2, tmp3, tmp4) ;\
-lbl/**/1: ;\
- brgz,pt arg1, lbl/**/0 ;\
+ VTAG_FLUSHUPAGE(VI##lbl, tmp5, tmp6, tmp1, tmp2, tmp3, tmp4) ;\
+lbl##1: ;\
+ brgz,pt arg1, lbl##0 ;\
sub arg1, 1, arg1
Index: b/usr/src/uts/sun4u/ml/trap_table.s
===================================================================
--- a/usr/src/uts/sun4u/ml/trap_table.s 2014-03-01 22:52:24.638944950 +0400
+++ b/usr/src/uts/sun4u/ml/trap_table.s 2014-03-01 22:54:10.809130173 +0400
@@ -323,7 +323,7 @@
saved ;\
retry ;\
SKIP(31-19-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
/*
@@ -361,7 +361,7 @@
saved ;\
retry ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
/*
@@ -395,7 +395,7 @@
saved ;\
retry ;\
SKIP(31-20-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
@@ -427,7 +427,7 @@
restored ;\
retry ;\
SKIP(31-19-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
/*
@@ -465,7 +465,7 @@
restored ;\
retry ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
/*
@@ -499,7 +499,7 @@
restored ;\
retry ;\
SKIP(31-20-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
@@ -529,7 +529,7 @@
saved ;\
retry ;\
SKIP(31-18-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
/*
@@ -566,7 +566,7 @@
saved ;\
retry ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
/*
@@ -598,7 +598,7 @@
saved ;\
retry ;\
SKIP(31-19-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
@@ -628,7 +628,7 @@
restored ;\
retry ;\
SKIP(31-18-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
/*
@@ -665,7 +665,7 @@
restored ;\
retry ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
/*
@@ -697,7 +697,7 @@
restored ;\
retry ;\
SKIP(31-19-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
#endif /* !lint */
@@ -786,7 +786,7 @@
b .spill_clean ;\
mov WSTATE_USER32, %g7 ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
#define SPILL_64clean(asi_num, tail) \
@@ -817,7 +817,7 @@
b .spill_clean ;\
mov WSTATE_USER64, %g7 ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
@@ -927,8 +927,8 @@
* VECTOR_INTERRUPT is for the vector trap.
*/
#define LEVEL_INTERRUPT(level) \
- .global tt_pil/**/level ;\
-tt_pil/**/level: ;\
+ .global tt_pil##level ;\
+tt_pil##level: ;\
ba,pt %xcc, pil_interrupt ;\
mov level, %g4 ;\
.align 32
@@ -1070,8 +1070,8 @@
*/
#ifdef UTSB_PHYS
#define DTLB_MISS(table_name) ;\
- .global table_name/**/_dtlbmiss ;\
-table_name/**/_dtlbmiss: ;\
+ .global table_name##_dtlbmiss ;\
+table_name##_dtlbmiss: ;\
mov MMU_TAG_ACCESS, %g6 /* select tag acc */ ;\
ldxa [%g0]ASI_DMMU_TSB_8K, %g1 /* g1 = tsbe ptr */ ;\
ldxa [%g6]ASI_DMMU, %g2 /* g2 = tag access */ ;\
@@ -1107,8 +1107,8 @@
#else /* UTSB_PHYS */
#define DTLB_MISS(table_name) ;\
- .global table_name/**/_dtlbmiss ;\
-table_name/**/_dtlbmiss: ;\
+ .global table_name##_dtlbmiss ;\
+table_name##_dtlbmiss: ;\
mov MMU_TAG_ACCESS, %g6 /* select tag acc */ ;\
ldxa [%g0]ASI_DMMU_TSB_8K, %g1 /* g1 = tsbe ptr */ ;\
ldxa [%g6]ASI_DMMU, %g2 /* g2 = tag access */ ;\
@@ -1163,8 +1163,8 @@
*/
#ifdef UTSB_PHYS
#define ITLB_MISS(table_name) \
- .global table_name/**/_itlbmiss ;\
-table_name/**/_itlbmiss: ;\
+ .global table_name##_itlbmiss ;\
+table_name##_itlbmiss: ;\
mov MMU_TAG_ACCESS, %g6 /* select tag acc */ ;\
ldxa [%g0]ASI_IMMU_TSB_8K, %g1 /* g1 = tsbe ptr */ ;\
ldxa [%g6]ASI_IMMU, %g2 /* g2 = tag access */ ;\
@@ -1200,8 +1200,8 @@
#else /* UTSB_PHYS */
#define ITLB_MISS(table_name) \
- .global table_name/**/_itlbmiss ;\
-table_name/**/_itlbmiss: ;\
+ .global table_name##_itlbmiss ;\
+table_name##_itlbmiss: ;\
mov MMU_TAG_ACCESS, %g6 /* select tag acc */ ;\
ldxa [%g0]ASI_IMMU_TSB_8K, %g1 /* g1 = tsbe ptr */ ;\
ldxa [%g6]ASI_IMMU, %g2 /* g2 = tag access */ ;\
Index: b/usr/src/uts/sun4u/starfire/ml/drmach_asm.s
===================================================================
--- a/usr/src/uts/sun4u/starfire/ml/drmach_asm.s 2014-03-01 22:52:24.638903689 +0400
+++ b/usr/src/uts/sun4u/starfire/ml/drmach_asm.s 2014-03-01 22:54:10.811484293 +0400
@@ -58,15 +58,15 @@
#define ICACHE_FLUSHALL(lbl, arg1, arg2, tmp1) \
ldxa [%g0]ASI_LSU, tmp1 ;\
btst LSU_IC, tmp1 ;\
- bz,pn %icc, lbl/**/1 ;\
+ bz,pn %icc, lbl##1 ;\
sub arg1, arg2, tmp1 ;\
-lbl/**/0: ;\
+lbl##0: ;\
stxa %g0, [tmp1]ASI_IC_TAG ;\
membar #Sync ;\
cmp %g0, tmp1 ;\
- bne,pt %icc, lbl/**/0 ;\
+ bne,pt %icc, lbl##0 ;\
sub tmp1, arg2, tmp1 ;\
-lbl/**/1:
+lbl##1:
/*
* arg1 = dcache_size
@@ -75,15 +75,15 @@
#define DCACHE_FLUSHALL(lbl, arg1, arg2, tmp1) \
ldxa [%g0]ASI_LSU, tmp1 ;\
btst LSU_DC, tmp1 ;\
- bz,pn %icc, lbl/**/1 ;\
+ bz,pn %icc, lbl##1 ;\
sub arg1, arg2, tmp1 ;\
-lbl/**/0: ;\
+lbl##0: ;\
stxa %g0, [tmp1]ASI_DC_TAG ;\
membar #Sync ;\
cmp %g0, tmp1 ;\
- bne,pt %icc, lbl/**/0 ;\
+ bne,pt %icc, lbl##0 ;\
sub tmp1, arg2, tmp1 ;\
-lbl/**/1:
+lbl##1:
/*
* arg1 = ecache flush physaddr
@@ -94,11 +94,11 @@
rdpr %pstate, tmp1 ;\
andn tmp1, PSTATE_IE | PSTATE_AM, tmp2 ;\
wrpr %g0, tmp2, %pstate ;\
- b lbl/**/1 ;\
-lbl/**/0: ;\
+ b lbl##1 ;\
+lbl##0: ;\
sub arg2, arg3, arg2 ;\
-lbl/**/1: ;\
- brgez,a arg2, lbl/**/0 ;\
+lbl##1: ;\
+ brgez,a arg2, lbl##0 ;\
ldxa [arg1 + arg2]ASI_MEM, %g0 ;\
wrpr %g0, tmp1, %pstate
@@ -125,29 +125,29 @@
rdpr %pstate, tmp1 ;\
andn tmp1, PSTATE_IE | PSTATE_AM, tmp2 ;\
wrpr tmp2, 0, %pstate ;\
- brnz,pt arg2, lbl/**/1 ;\
+ brnz,pt arg2, lbl##1 ;\
sethi %hi(FLUSH_ADDR), tmp2 ;\
stxa %g0, [arg1]ASI_DTLB_DEMAP ;\
stxa %g0, [arg1]ASI_ITLB_DEMAP ;\
- b lbl/**/5 ;\
+ b lbl##5 ;\
flush tmp2 ;\
-lbl/**/1: ;\
+lbl##1: ;\
set MMU_SCONTEXT, tmp3 ;\
ldxa [tmp3]ASI_DMMU, tmp4 ;\
or DEMAP_SECOND | DEMAP_PAGE_TYPE, arg1, arg1 ;\
cmp tmp4, arg2 ;\
- be,a,pt %icc, lbl/**/4 ;\
+ be,a,pt %icc, lbl##4 ;\
nop ;\
stxa arg2, [tmp3]ASI_DMMU ;\
-lbl/**/4: ;\
+lbl##4: ;\
stxa %g0, [arg1]ASI_DTLB_DEMAP ;\
stxa %g0, [arg1]ASI_ITLB_DEMAP ;\
flush tmp2 ;\
- be,a,pt %icc, lbl/**/5 ;\
+ be,a,pt %icc, lbl##5 ;\
nop ;\
stxa tmp4, [tmp3]ASI_DMMU ;\
flush tmp2 ;\
-lbl/**/5: ;\
+lbl##5: ;\
wrpr %g0, tmp1, %pstate
/*
@@ -159,24 +159,24 @@
*/
#define DTLB_FLUSH_UNLOCKED(lbl, arg1, tmp1, tmp2, tmp3, \
tmp4, tmp5, tmp6) \
-lbl/**/0: ;\
+lbl##0: ;\
sllx arg1, 3, tmp3 ;\
SF_WORKAROUND(tmp1, tmp2) ;\
ldxa [tmp3]ASI_DTLB_ACCESS, tmp4 ;\
srlx tmp4, 6, tmp4 ;\
andcc tmp4, 1, %g0 ;\
- bnz,pn %xcc, lbl/**/1 ;\
+ bnz,pn %xcc, lbl##1 ;\
srlx tmp4, 57, tmp4 ;\
andcc tmp4, 1, %g0 ;\
- beq,pn %xcc, lbl/**/1 ;\
+ beq,pn %xcc, lbl##1 ;\
nop ;\
set TAGREAD_CTX_MASK, tmp1 ;\
ldxa [tmp3]ASI_DTLB_TAGREAD, tmp2 ;\
and tmp2, tmp1, tmp6 ;\
andn tmp2, tmp1, tmp5 ;\
VTAG_FLUSHPAGE(VD, tmp5, tmp6, tmp1, tmp2, tmp3, tmp4) ;\
-lbl/**/1: ;\
- brgz,pt arg1, lbl/**/0 ;\
+lbl##1: ;\
+ brgz,pt arg1, lbl##0 ;\
sub arg1, 1, arg1
/*
@@ -188,24 +188,24 @@
*/
#define ITLB_FLUSH_UNLOCKED(lbl, arg1, tmp1, tmp2, tmp3, \
tmp4, tmp5, tmp6) \
-lbl/**/0: ;\
+lbl##0: ;\
sllx arg1, 3, tmp3 ;\
SF_WORKAROUND(tmp1, tmp2) ;\
ldxa [tmp3]ASI_ITLB_ACCESS, tmp4 ;\
srlx tmp4, 6, tmp4 ;\
andcc tmp4, 1, %g0 ;\
- bnz,pn %xcc, lbl/**/1 ;\
+ bnz,pn %xcc, lbl##1 ;\
srlx tmp4, 57, tmp4 ;\
andcc tmp4, 1, %g0 ;\
- beq,pn %xcc, lbl/**/1 ;\
+ beq,pn %xcc, lbl##1 ;\
nop ;\
set TAGREAD_CTX_MASK, tmp1 ;\
ldxa [tmp3]ASI_ITLB_TAGREAD, tmp2 ;\
and tmp2, tmp1, tmp6 ;\
andn tmp2, tmp1, tmp5 ;\
VTAG_FLUSHPAGE(VI, tmp5, tmp6, tmp1, tmp2, tmp3, tmp4) ;\
-lbl/**/1: ;\
- brgz,pt arg1, lbl/**/0 ;\
+lbl##1: ;\
+ brgz,pt arg1, lbl##0 ;\
sub arg1, 1, arg1
#define CLEARTL(lvl) \
Index: b/usr/src/uts/sun4v/cpu/common_asm.s
===================================================================
--- a/usr/src/uts/sun4v/cpu/common_asm.s 2014-03-01 22:52:24.639055571 +0400
+++ b/usr/src/uts/sun4v/cpu/common_asm.s 2014-03-01 22:54:10.813856498 +0400
@@ -638,21 +638,21 @@
#define BRZPT brz,pt
#define KSTAT_Q_UPDATE(QOP, QBR, QZERO, QRETURN, QTYPE) \
- ld [%o0 + QTYPE/**/CNT], %o1; /* %o1 = old qlen */ \
+ ld [%o0 + QTYPE##CNT], %o1; /* %o1 = old qlen */ \
QOP %o1, 1, %o2; /* %o2 = new qlen */ \
QBR %o1, QZERO; /* done if qlen == 0 */ \
- st %o2, [%o0 + QTYPE/**/CNT]; /* delay: save qlen */ \
- ldx [%o0 + QTYPE/**/LASTUPDATE], %o3; \
- ldx [%o0 + QTYPE/**/TIME], %o4; /* %o4 = old time */ \
- ldx [%o0 + QTYPE/**/LENTIME], %o5; /* %o5 = old lentime */ \
+ st %o2, [%o0 + QTYPE##CNT]; /* delay: save qlen */ \
+ ldx [%o0 + QTYPE##LASTUPDATE], %o3; \
+ ldx [%o0 + QTYPE##TIME], %o4; /* %o4 = old time */ \
+ ldx [%o0 + QTYPE##LENTIME], %o5; /* %o5 = old lentime */ \
sub %g1, %o3, %o2; /* %o2 = time delta */ \
mulx %o1, %o2, %o3; /* %o3 = cur lentime */ \
add %o4, %o2, %o4; /* %o4 = new time */ \
add %o5, %o3, %o5; /* %o5 = new lentime */ \
- stx %o4, [%o0 + QTYPE/**/TIME]; /* save time */ \
- stx %o5, [%o0 + QTYPE/**/LENTIME]; /* save lentime */ \
+ stx %o4, [%o0 + QTYPE##TIME]; /* save time */ \
+ stx %o5, [%o0 + QTYPE##LENTIME]; /* save lentime */ \
QRETURN; \
- stx %g1, [%o0 + QTYPE/**/LASTUPDATE]; /* lastupdate = now */
+ stx %g1, [%o0 + QTYPE##LASTUPDATE]; /* lastupdate = now */
.align 16
ENTRY(kstat_waitq_enter)
Index: b/usr/src/uts/sun4v/ml/trap_table.s
===================================================================
--- a/usr/src/uts/sun4v/ml/trap_table.s 2014-03-01 22:52:24.639005768 +0400
+++ b/usr/src/uts/sun4v/ml/trap_table.s 2014-03-01 22:54:10.818601604 +0400
@@ -316,7 +316,7 @@
saved ;\
retry ;\
SKIP(31-19-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
/*
@@ -354,11 +354,11 @@
saved ;\
retry ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
#define SPILL_32bit_tt1(asi_num, tail) \
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty ;\
.align 128
@@ -391,7 +391,7 @@
restored ;\
retry ;\
SKIP(31-19-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
/*
@@ -429,7 +429,7 @@
restored ;\
retry ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
@@ -459,19 +459,19 @@
saved ;\
retry ;\
SKIP(31-18-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
#define SPILL_64bit_ktt1(tail) \
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty ;\
.align 128
#define SPILL_mixed_ktt1(tail) \
btst 1, %sp ;\
- bz,a,pt %xcc, fault_32bit_/**/tail ;\
+ bz,a,pt %xcc, fault_32bit_##tail ;\
srl %sp, 0, %sp ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty ;\
.align 128
@@ -509,11 +509,11 @@
saved ;\
retry ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
#define SPILL_64bit_tt1(asi_num, tail) \
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty ;\
.align 128
@@ -543,7 +543,7 @@
restored ;\
retry ;\
SKIP(31-18-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
/*
@@ -580,7 +580,7 @@
restored ;\
retry ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
@@ -666,7 +666,7 @@
b .spill_clean ;\
mov WSTATE_USER32, %g7 ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_32bit_/**/tail ;\
+ ba,a,pt %xcc, fault_32bit_##tail ;\
.empty
#define SPILL_64clean(asi_num, tail) \
@@ -697,7 +697,7 @@
b .spill_clean ;\
mov WSTATE_USER64, %g7 ;\
SKIP(31-25-TT_TRACE_L_INS) ;\
- ba,a,pt %xcc, fault_64bit_/**/tail ;\
+ ba,a,pt %xcc, fault_64bit_##tail ;\
.empty
@@ -796,8 +796,8 @@
* VECTOR_INTERRUPT is for the vector trap.
*/
#define LEVEL_INTERRUPT(level) \
- .global tt_pil/**/level ;\
-tt_pil/**/level: ;\
+ .global tt_pil##level ;\
+tt_pil##level: ;\
ba,pt %xcc, pil_interrupt ;\
mov level, %g4 ;\
.align 32
@@ -940,8 +940,8 @@
* (0=kernel, 1=invalid, or 2=user) rather than context ID)
*/
#define DTLB_MISS(table_name) ;\
- .global table_name/**/_dtlbmiss ;\
-table_name/**/_dtlbmiss: ;\
+ .global table_name##_dtlbmiss ;\
+table_name##_dtlbmiss: ;\
GET_MMU_D_PTAGACC_CTXTYPE(%g2, %g3) /* 8 instr */ ;\
cmp %g3, INVALID_CONTEXT ;\
ble,pn %xcc, sfmmu_kdtlb_miss ;\
@@ -984,8 +984,8 @@
* (0=kernel, 1=invalid, or 2=user) rather than context ID)
*/
#define ITLB_MISS(table_name) \
- .global table_name/**/_itlbmiss ;\
-table_name/**/_itlbmiss: ;\
+ .global table_name##_itlbmiss ;\
+table_name##_itlbmiss: ;\
GET_MMU_I_PTAGACC_CTXTYPE(%g2, %g3) /* 8 instr */ ;\
cmp %g3, INVALID_CONTEXT ;\
ble,pn %xcc, sfmmu_kitlb_miss ;\
Reference in New Issue View Git Blame Copy Permalink