PERFORCE change 32711 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Jun 6 21:26:07 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=32711
Change 32711 by marcel at marcel_nfs on 2003/06/06 21:25:05
IFC @32710
Affected files ...
.. //depot/projects/ia64/share/colldef/Makefile#12 integrate
.. //depot/projects/ia64/share/colldef/bg_BG.CP1251.src#2 integrate
.. //depot/projects/ia64/share/colldef/map.CP866#2 integrate
.. //depot/projects/ia64/share/colldef/map.KOI8-R#2 integrate
.. //depot/projects/ia64/share/colldef/map.KOI8-U#2 integrate
.. //depot/projects/ia64/share/colldef/ru_RU.CP1251.src#1 branch
.. //depot/projects/ia64/share/colldef/ru_RU.CP866.src#2 integrate
.. //depot/projects/ia64/share/colldef/ru_RU.ISO8859-5.src#2 integrate
.. //depot/projects/ia64/share/colldef/ru_RU.KOI8-R.src#2 integrate
.. //depot/projects/ia64/share/colldef/uk_UA.KOI8-U.src#2 integrate
.. //depot/projects/ia64/share/monetdef/Makefile#9 integrate
.. //depot/projects/ia64/share/monetdef/ru_RU.CP1251.src#1 branch
.. //depot/projects/ia64/share/msgdef/Makefile#9 integrate
.. //depot/projects/ia64/share/msgdef/ru_RU.CP1251.src#1 branch
.. //depot/projects/ia64/share/numericdef/Makefile#9 integrate
.. //depot/projects/ia64/share/numericdef/ru_RU.CP866.src#2 delete
.. //depot/projects/ia64/share/numericdef/ru_RU.ISO8859-5.src#2 delete
.. //depot/projects/ia64/share/numericdef/uk_UA.ISO8859-5.src#2 delete
.. //depot/projects/ia64/share/timedef/Makefile#9 integrate
.. //depot/projects/ia64/share/timedef/ru_RU.CP1251.src#1 branch
.. //depot/projects/ia64/sys/ia64/ia64/pmap.c#65 integrate
.. //depot/projects/ia64/sys/ia64/ia64/trap.c#57 integrate
.. //depot/projects/ia64/sys/vm/vm_map.c#54 integrate
.. //depot/projects/ia64/sys/vm/vm_object.c#59 integrate
.. //depot/projects/ia64/tools/debugscripts/dot.gdbinit#1 branch
.. //depot/projects/ia64/tools/debugscripts/gdbinit.i386#1 branch
.. //depot/projects/ia64/tools/debugscripts/gdbinit.kernel#1 branch
.. //depot/projects/ia64/tools/debugscripts/gdbinit.vinum#1 branch
Differences ...
==== //depot/projects/ia64/share/colldef/Makefile#12 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/colldef/Makefile,v 1.54 2003/06/02 07:53:44 ache Exp $
+# $FreeBSD: src/share/colldef/Makefile,v 1.55 2003/06/06 23:59:18 ache Exp $
#
NOMAN=YES
@@ -25,6 +25,7 @@
lt_LT.ISO8859-4 \
lt_LT.ISO8859-13 \
pl_PL.ISO8859-2 \
+ ru_RU.CP1251 \
ru_RU.CP866 \
ru_RU.ISO8859-5 \
ru_RU.KOI8-R \
@@ -75,6 +76,7 @@
lt_LT.ISO8859-4.out: map.ISO8859-4
lt_LT.ISO8859-13.out: map.ISO8859-13
pl_PL.ISO8859-2.out: map.ISO8859-2
+ru_RU.CP1251.out: map.CP1251
ru_RU.CP866.out: map.CP866
ru_RU.ISO8859-5.out: map.ISO8859-5
ru_RU.KOI8-R.out: map.KOI8-R
==== //depot/projects/ia64/share/colldef/bg_BG.CP1251.src#2 (text+ko) ====
@@ -1,18 +1,19 @@
# CP1251 (backward compatible with ASCII)
#
-# $FreeBSD: src/share/colldef/bg_BG.CP1251.src,v 1.1 2001/11/05 06:58:02 ache Exp $
+# $FreeBSD: src/share/colldef/bg_BG.CP1251.src,v 1.2 2003/06/07 03:26:21 ache Exp $
#
charmap map.CP1251
order \
# controls
<NU>;...;<US>;\
#
- <SP>;!;\";<Nb>;<DO>;\
- %;&;';\(;\);*;+;\,;-;.;/;\
+ <NS>;<SP>;!;\";<"6>;<"9>;<<<>;</>/>>;\
+ <Nb>;<Eu>;<Cu>;<DO>;\
+ %;&;';<'6>;<'9>;\(;\);*;+;<+->;\,;<-->;-;.;/;\
# digits
- 0;1;2;3;...;9;\
+ 0;...;9;\
#
- :;\;;\<;=;>;?;<At>;\
+ :;\;;\<;=;>;?;<SE>;<PI>;<Co>;<Rg>;<At>;\
# uppercase
A;...;Z;\
<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<Z%>;<Z=>;\
@@ -28,13 +29,15 @@
<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
#
- \{;|;\};~;<DT>;\
+ \{;<NO>;|;<BB>;\};~;<.M>;<DG>;<My>;\
+ <-N>;<-M>;<.9>;<:9>;</->;</=>;<.3>;<%0>;<<1>;</>1>;\
+ <N0>;<TM>;<sb>;<FB>;<DT>;\
#
- <D%>;<G%>;<.9>;<g%>;<:9>;<.3>;</->;</=>;\
- <Eu>;<%0>;<LJ>;<<1>;<NJ>;<KJ>;<Ts>;<DZ>;\
- <d%>;<'6>;<'9>;<"6>;<"9>;<sb>;<-N>;<-M>;\
- <FB>;<TM>;<lj>;</>1>;<nj>;<kj>;<ts>;<dz>;\
- <NS>;<V%>;<v%>;<J%>;<Cu>;<G3>;<BB>;<SE>;\
- <IO>;<Co>;<IE>;<<<>;<NO>;<-->;<Rg>;<YI>;\
- <DG>;<+->;<II>;<ii>;<g3>;<My>;<PI>;<.M>;\
- <io>;<N0>;<ie>;</>/>>;<j%>;<DS>;<ds>;<yi>
+ <D%>;<G%>;<g%>;\
+ <LJ>;<NJ>;<KJ>;<Ts>;<DZ>;\
+ <d%>;\
+ <lj>;<nj>;<kj>;<ts>;<dz>;\
+ <V%>;<v%>;<J%>;<G3>;\
+ <IO>;<IE>;<YI>;\
+ <II>;<ii>;<g3>;\
+ <io>;<ie>;<j%>;<DS>;<ds>;<yi>
==== //depot/projects/ia64/share/colldef/map.CP866#2 (text+ko) ====
@@ -1,3 +1,4 @@
+# $FreeBSD: src/share/colldef/map.CP866,v 1.2 2003/06/07 02:51:52 ache Exp $
NU \x00
SH \x01
SX \x02
@@ -44,131 +45,131 @@
!) \x7d
'? \x7e
DT \x7f
-hh \xc4
-vv \xb3
-dr \xda
-dl \xbf
-ur \xc0
-ul \xd9
-vr \xc3
-vl \xb4
-dh \xc2
-uh \xc1
-vh \xc5
-TB \xdf
-LB \xdc
-FB \xdb
-lB \xdd
-RB \xde
+A= \x80
+B= \x81
+V= \x82
+G= \x83
+D= \x84
+E= \x85
+Z% \x86
+Z= \x87
+I= \x88
+J= \x89
+K= \x8a
+L= \x8b
+M= \x8c
+N= \x8d
+O= \x8e
+P= \x8f
+R= \x90
+S= \x91
+T= \x92
+U= \x93
+F= \x94
+H= \x95
+C= \x96
+C% \x97
+S% \x98
+Sc \x99
+=" \x9a
+Y= \x9b
+%" \x9c
+JE \x9d
+JU \x9e
+JA \x9f
+a= \xa0
+b= \xa1
+v= \xa2
+g= \xa3
+d= \xa4
+e= \xa5
+z% \xa6
+z= \xa7
+i= \xa8
+j= \xa9
+k= \xaa
+l= \xab
+m= \xac
+n= \xad
+o= \xae
+p= \xaf
.S \xb0
:S \xb1
?S \xb2
-Iu \xf4
-fS \xfe
-sb \xf9
-RT \xfb
-?2 \xf7
-=< \xf3
->= \xf2
-NS \xff
-Il \xf5
-DG \xf8
-2S \xfd
-.M \xfa
--: \xf6
-HH \xcd
+vv \xb3
+vl \xb4
+vL \xb5
+Vl \xb6
+Dl \xb7
+dL \xb8
+VL \xb9
VV \xba
-dR \xd5
-io \xf1
-Dr \xd6
-DR \xc9
-dL \xb8
-Dl \xb7
LD \xbb
-uR \xd4
-Ur \xd3
-UR \xc8
+UL \xbc
+Ul \xbd
uL \xbe
-Ul \xbd
-UL \xbc
+dl \xbf
+ur \xc0
+uh \xc1
+dh \xc2
+vr \xc3
+hh \xc4
+vh \xc5
vR \xc6
Vr \xc7
+UR \xc8
+DR \xc9
+UH \xca
+DH \xcb
VR \xcc
-vL \xb5
-IO \xf0
-Vl \xb6
-VL \xb9
+HH \xcd
+VH \xce
+uH \xcf
+Uh \xd0
dH \xd1
Dh \xd2
-DH \xcb
-uH \xcf
-Uh \xd0
-UH \xca
+Ur \xd3
+uR \xd4
+dR \xd5
+Dr \xd6
+Vh \xd7
vH \xd8
-Vh \xd7
-VH \xce
-Co \xfc
-ju \xee
-a= \xa0
-b= \xa1
-c= \xe6
-d= \xa4
-e= \xa5
-f= \xe4
-g= \xa3
-h= \xe5
-i= \xa8
-j= \xa9
-k= \xaa
-l= \xab
-m= \xac
-n= \xad
-o= \xae
-p= \xaf
-ja \xef
+ul \xd9
+dr \xda
+FB \xdb
+LB \xdc
+lB \xdd
+RB \xde
+TB \xdf
r= \xe0
s= \xe1
t= \xe2
u= \xe3
-z% \xa6
-v= \xa2
-%' \xec
-y= \xeb
-z= \xa7
+f= \xe4
+h= \xe5
+c= \xe6
+c% \xe7
s% \xe8
-je \xed
sc \xe9
-c% \xe7
=' \xea
-JU \x9e
-A= \x80
-B= \x81
-C= \x96
-D= \x84
-E= \x85
-F= \x94
-G= \x83
-H= \x95
-I= \x88
-J= \x89
-K= \x8a
-L= \x8b
-M= \x8c
-N= \x8d
-O= \x8e
-P= \x8f
-JA \x9f
-R= \x90
-S= \x91
-T= \x92
-U= \x93
-Z% \x86
-V= \x82
-%" \x9c
-Y= \x9b
-Z= \x87
-S% \x98
-JE \x9d
-Sc \x99
-C% \x97
-=" \x9a
+y= \xeb
+%' \xec
+je \xed
+ju \xee
+ja \xef
+IO \xf0
+io \xf1
+IE \xf2
+ie \xf3
+YI \xf4
+yi \xf5
+V% \xf6
+v% \xf7
+DG \xf8
+Sb \xf9
+.M \xfa
+RT \xfb
+N0 \xfc
+Cu \xfd
+fS \xfe
+NS \xff
==== //depot/projects/ia64/share/colldef/map.KOI8-R#2 (text+ko) ====
@@ -1,3 +1,4 @@
+# $FreeBSD: src/share/colldef/map.KOI8-R,v 1.2 2003/06/07 02:51:52 ache Exp $
NU \x00
SH \x01
SX \x02
@@ -65,7 +66,7 @@
?S \x92
Iu \x93
fS \x94
-sb \x95
+Sb \x95
RT \x96
?2 \x97
=< \x98
==== //depot/projects/ia64/share/colldef/map.KOI8-U#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/colldef/map.KOI8-U,v 1.2 2000/05/04 18:03:46 phantom Exp $
+# $FreeBSD: src/share/colldef/map.KOI8-U,v 1.3 2003/06/07 02:59:28 ache Exp $
NU \x00
SH \x01
SX \x02
@@ -66,7 +66,7 @@
?S \x92
Iu \x93
fS \x94
-sb \x95
+Sb \x95
RT \x96
?2 \x97
=< \x98
==== //depot/projects/ia64/share/colldef/ru_RU.CP866.src#2 (text+ko) ====
@@ -1,18 +1,18 @@
# CP866 (backward compatible with ASCII)
#
-# $FreeBSD: src/share/colldef/ru_RU.CP866.src,v 1.8 1999/08/28 00:59:49 peter Exp $
+# $FreeBSD: src/share/colldef/ru_RU.CP866.src,v 1.10 2003/06/07 02:51:52 ache Exp $
#
charmap map.CP866
order \
# controls
<NU>;...;<US>;\
#
- <NS>;<SP>;!;\";<Nb>;<DO>;\
- %;&;';\(;\);*;+;<-:>;\,;-;.;/;\
+ <NS>;<SP>;!;\";<Nb>;<Cu>;<DO>;\
+ %;&;';\(;\);*;+;\,;-;.;/;\
# digits
- 0;1;(2,<2S>);3;...;9;\
+ 0;...;9;\
#
- :;\;;\<;<=<>;=;</>=>;>;?;<Co>;<At>;\
+ :;\;;\<;=;>;?;<At>;\
# capital
A;...;Z;\
<A=>;<B=>;<V=>;<G=>;<D=>;<E=>;<IO>;<Z%>;<Z=>;\
@@ -28,12 +28,13 @@
<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
#
- \{;|;\};~;<.M>;<DG>;<DT>;\
+ \{;|;\};~;<.M>;<DG>;<Sb>;<N0>;<RT>;\
#
- <sb>;<RT>;<?2>;<Iu>;<Il>;\
<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
- <TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>
+ <TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>;<DT>;\
+#
+ <IE>;<ie>;<YI>;<yi>;<V%>;<v%>
==== //depot/projects/ia64/share/colldef/ru_RU.ISO8859-5.src#2 (text+ko) ====
@@ -1,6 +1,6 @@
# Russian part of ISO8859-5 (backward compatible with ASCII)
#
-# $FreeBSD: src/share/colldef/ru_RU.ISO8859-5.src,v 1.2 2001/06/10 13:43:47 ache Exp $
+# $FreeBSD: src/share/colldef/ru_RU.ISO8859-5.src,v 1.3 2003/06/07 00:46:20 ache Exp $
#
charmap map.ISO8859-5
order \
@@ -8,7 +8,7 @@
<NU>;...;<US>;\
#
<NS>;<SP>;!;\";<Nb>;<DO>;\
- %;&;';\(;\);*;+;\,;-;.;/;\
+ %;&;';\(;\);*;+;\,;<-->;-;.;/;\
# digits
0;...;9;\
#
@@ -28,10 +28,12 @@
<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
#
- \{;|;\};~;<DT>;<PA>;<HO>;<BH>;<NH>;<IN>;<NL>;\
+ \{;|;\};~;<N0>;<DT>;\
+#
+ <PA>;<HO>;<BH>;<NH>;<IN>;<NL>;\
<SA>;<ES>;<HS>;<HJ>;<VS>;<PD>;<PU>;<RI>;<S2>;\
<S3>;<DC>;<P1>;<P2>;<TS>;<CC>;<MW>;<SG>;<EG>;\
<SS>;<GC>;<SC>;<CI>;<ST>;<OC>;<PM>;<AC>;<D%>;\
<G%>;<IE>;<DS>;<II>;<YI>;<J%>;<LJ>;<NJ>;<Ts>;\
- <KJ>;<-->;<V%>;<DZ>;<N0>;<d%>;<g%>;<ie>;<ds>;\
+ <KJ>;<V%>;<DZ>;<d%>;<g%>;<ie>;<ds>;\
<ii>;<yi>;<j%>;<lj>;<nj>;<ts>;<kj>;<SE>;<v%>;<dz>
==== //depot/projects/ia64/share/colldef/ru_RU.KOI8-R.src#2 (text+ko) ====
@@ -1,6 +1,6 @@
# koi8-r (backward compatible with ASCII)
#
-# $FreeBSD: src/share/colldef/ru_RU.KOI8-R.src,v 1.8 1999/08/28 00:59:49 peter Exp $
+# $FreeBSD: src/share/colldef/ru_RU.KOI8-R.src,v 1.10 2003/06/07 02:51:52 ache Exp $
#
charmap map.KOI8-R
order \
@@ -28,12 +28,12 @@
<s=>;<t=>;<u=>;<f=>;<h=>;<c=>;<c%>;<s%>;<sc>;\
<='>;<y=>;<%'>;<je>;<ju>;<ja>;\
#
- \{;|;\};~;<.M>;<DG>;<DT>;\
+ \{;|;\};~;<.M>;<DG>;\
#
- <sb>;<RT>;<?2>;<Iu>;<Il>;\
+ <Sb>;<RT>;<?2>;<Iu>;<Il>;\
<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<Dr>;<DR>;\
<dl>;<dL>;<Dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
<ul>;<uL>;<Ul>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
<vl>;<vL>;<Vl>;<VL>;<dh>;<dH>;<Dh>;<DH>;\
<uh>;<uH>;<Uh>;<UH>;<vh>;<vH>;<Vh>;<VH>;\
- <TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>
+ <TB>;<LB>;<FB>;<lB>;<RB>;<.S>;<:S>;<?S>;<fS>;<DT>
==== //depot/projects/ia64/share/colldef/uk_UA.KOI8-U.src#2 (text+ko) ====
@@ -1,6 +1,6 @@
# koi8-u (backward compatible with ASCII)
#
-# $FreeBSD: src/share/colldef/uk_UA.KOI8-U.src,v 1.2 2000/05/04 18:03:47 phantom Exp $
+# $FreeBSD: src/share/colldef/uk_UA.KOI8-U.src,v 1.3 2003/06/07 02:59:28 ache Exp $
#
charmap map.KOI8-U
order \
@@ -30,7 +30,7 @@
#
\{;|;\};~;<.M>;<DG>;<DT>;\
#
- <sb>;<RT>;<?2>;<Iu>;<Il>;\
+ <Sb>;<RT>;<?2>;<Iu>;<Il>;\
<hh>;<HH>;<vv>;<VV>;<dr>;<dR>;<DR>;\
<dl>;<LD>;<ur>;<uR>;<Ur>;<UR>;\
<ul>;<uL>;<UL>;<vr>;<vR>;<Vr>;<VR>;\
==== //depot/projects/ia64/share/monetdef/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/monetdef/Makefile,v 1.43 2002/12/30 09:09:57 ache Exp $
+# $FreeBSD: src/share/monetdef/Makefile,v 1.44 2003/06/07 00:28:58 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -38,6 +38,7 @@
pt_BR.ISO8859-1 \
pt_PT.ISO8859-1 \
ro_RO.ISO8859-2 \
+ ru_RU.CP1251 \
ru_RU.CP866 \
ru_RU.ISO8859-5 \
ru_RU.KOI8-R \
==== //depot/projects/ia64/share/msgdef/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/msgdef/Makefile,v 1.44 2002/12/30 09:09:58 ache Exp $
+# $FreeBSD: src/share/msgdef/Makefile,v 1.45 2003/06/07 00:26:32 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -30,6 +30,7 @@
pl_PL.ISO8859-2 \
pt_PT.ISO8859-1 \
ro_RO.ISO8859-2 \
+ ru_RU.CP1251 \
ru_RU.CP866 \
ru_RU.ISO8859-5 \
ru_RU.KOI8-R \
==== //depot/projects/ia64/share/numericdef/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/numericdef/Makefile,v 1.42 2002/12/30 09:09:58 ache Exp $
+# $FreeBSD: src/share/numericdef/Makefile,v 1.45 2003/06/07 01:24:02 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -30,8 +30,6 @@
pt_BR.ISO8859-1 \
pt_PT.ISO8859-1 \
ro_RO.ISO8859-2 \
- ru_RU.CP866 \
- ru_RU.ISO8859-5 \
ru_RU.KOI8-R \
sk_SK.ISO8859-2 \
sl_SI.ISO8859-2 \
@@ -39,7 +37,6 @@
sr_YU.ISO8859-5 \
sv_SE.ISO8859-1 \
tr_TR.ISO8859-9 \
- uk_UA.ISO8859-5 \
uk_UA.KOI8-U \
zh_CN.eucCN \
zh_TW.Big5
@@ -55,8 +52,10 @@
FR_LINKS= fr_CA fr_CH
DE_LINKS= de_AT de_CH
IT_LINKS= it_CH
-
BE_LINKS= nl_BE
+RU_LINKS= ru_RU.CP1251 ru_RU.CP866 ru_RU.ISO8859-5
+UA_LINKS= uk_UA.ISO8859-5
+CN_LINKS= zh_CN.GBK
.SUFFIXES: .src .out
@@ -114,6 +113,18 @@
ln -sf ../fr_BE.ISO8859-1/LC_NUMERIC \
${LOCALEDIR}/${link}.ISO8859-15/LC_NUMERIC
.endfor
+.for link in ${RU_LINKS}
+ ln -sf ../ru_RU.KOI8-R/LC_NUMERIC \
+ ${LOCALEDIR}/${link}/LC_NUMERIC
+.endfor
+.for link in ${UA_LINKS}
+ ln -sf ../uk_UA.KOI8-U/LC_NUMERIC \
+ ${LOCALEDIR}/${link}/LC_NUMERIC
+.endfor
+.for link in ${CN_LINKS}
+ ln -sf ../zh_CN.eucCN/LC_NUMERIC \
+ ${LOCALEDIR}/${link}/LC_NUMERIC
+.endfor
.for link in ${ASCIILINKS}
ln -sf ../${link}.ISO8859-1/LC_NUMERIC \
${LOCALEDIR}/${link}.US-ASCII/LC_NUMERIC
==== //depot/projects/ia64/share/timedef/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/timedef/Makefile,v 1.31 2002/12/30 09:09:58 ache Exp $
+# $FreeBSD: src/share/timedef/Makefile,v 1.32 2003/06/07 00:12:12 ache Exp $
NOMAN=YES
CLEANFILES+= ${LOCALES:S/$/.out/g}
@@ -33,6 +33,7 @@
pt_BR.ISO8859-1 \
pt_PT.ISO8859-1 \
ro_RO.ISO8859-2 \
+ ru_RU.CP1251 \
ru_RU.CP866 \
ru_RU.ISO8859-5 \
ru_RU.KOI8-R \
==== //depot/projects/ia64/sys/ia64/ia64/pmap.c#65 (text+ko) ====
@@ -43,7 +43,7 @@
* from: @(#)pmap.c 7.7 (Berkeley) 5/12/91
* from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp
* with some ideas from NetBSD's alpha pmap
- * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.107 2003/05/26 22:54:18 marcel Exp $
+ * $FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.108 2003/06/07 04:17:39 marcel Exp $
*/
/*
@@ -1508,6 +1508,7 @@
va = pv->pv_va;
if (va >= sva && va < eva) {
pte = pmap_find_vhpt(va);
+ KASSERT(pte != NULL, ("pte"));
pmap_remove_pte(pmap, pte, va, pv, 1);
pmap_invalidate_page(pmap, va);
}
@@ -1565,6 +1566,7 @@
oldpmap = pmap_install(pmap);
pte = pmap_find_vhpt(va);
+ KASSERT(pte != NULL, ("pte"));
if (pmap_pte_pa(pte) != VM_PAGE_TO_PHYS(m))
panic("pmap_remove_all: pv_table for %lx is inconsistent", VM_PAGE_TO_PHYS(m));
pmap_remove_pte(pmap, pte, va, pv, 1);
@@ -2052,7 +2054,7 @@
oldpmap = pmap_install(pmap);
pte = pmap_find_vhpt(va);
-
+ KASSERT(pte != NULL, ("pte"));
if (wired && !pmap_pte_w(pte))
pmap->pm_stats.wired_count++;
else if (!wired && pmap_pte_w(pte))
@@ -2212,16 +2214,9 @@
}
pte = pmap_find_vhpt(pv->pv_va);
- if (!pte)
- panic("pmap_remove_pages: page on pm_pvlist has no pte\n");
-
-
-/*
- * We cannot remove wired pages from a process' mapping at this time
- */
- if (pte->pte_ig & PTE_IG_WIRED) {
+ KASSERT(pte != NULL, ("pte"));
+ if (pte->pte_ig & PTE_IG_WIRED)
continue;
- }
pmap_remove_pte(pmap, pte, pv->pv_va, pv, 1);
}
@@ -2250,6 +2245,7 @@
pmap_t oldpmap = pmap_install(pv->pv_pmap);
struct ia64_lpte *pte;
pte = pmap_find_vhpt(pv->pv_va);
+ KASSERT(pte != NULL, ("pte"));
pmap_pte_set_prot(pte, newprot);
pmap_update_vhpt(pte, pv->pv_va);
pmap_invalidate_page(pv->pv_pmap, pv->pv_va);
@@ -2286,6 +2282,7 @@
pmap_t oldpmap = pmap_install(pv->pv_pmap);
struct ia64_lpte *pte;
pte = pmap_find_vhpt(pv->pv_va);
+ KASSERT(pte != NULL, ("pte"));
if (pte->pte_a) {
count++;
pte->pte_a = 0;
@@ -2317,6 +2314,7 @@
pmap_t oldpmap = pmap_install(pv->pv_pmap);
struct ia64_lpte *pte = pmap_find_vhpt(pv->pv_va);
pmap_install(oldpmap);
+ KASSERT(pte != NULL, ("pte"));
if (pte->pte_a)
return 1;
}
@@ -2343,6 +2341,7 @@
pmap_t oldpmap = pmap_install(pv->pv_pmap);
struct ia64_lpte *pte = pmap_find_vhpt(pv->pv_va);
pmap_install(oldpmap);
+ KASSERT(pte != NULL, ("pte"));
if (pte->pte_d)
return 1;
}
@@ -2364,6 +2363,7 @@
TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
pmap_t oldpmap = pmap_install(pv->pv_pmap);
struct ia64_lpte *pte = pmap_find_vhpt(pv->pv_va);
+ KASSERT(pte != NULL, ("pte"));
if (pte->pte_d) {
pte->pte_d = 0;
pmap_update_vhpt(pte, pv->pv_va);
@@ -2389,6 +2389,7 @@
TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
pmap_t oldpmap = pmap_install(pv->pv_pmap);
struct ia64_lpte *pte = pmap_find_vhpt(pv->pv_va);
+ KASSERT(pte != NULL, ("pte"));
if (pte->pte_a) {
pte->pte_a = 0;
pmap_update_vhpt(pte, pv->pv_va);
==== //depot/projects/ia64/sys/ia64/ia64/trap.c#57 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.81 2003/06/06 23:44:05 marcel Exp $ */
+/* $FreeBSD: src/sys/ia64/ia64/trap.c,v 1.82 2003/06/07 04:10:07 marcel Exp $ */
/* From: src/sys/alpha/alpha/trap.c,v 1.33 */
/* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */
@@ -699,7 +699,9 @@
/*
* Additionally check the privilege level. We don't want to
* panic when we're in the gateway page, running at user
- * level. This happens for the signal trampolines.
+ * level. This happens for the signal trampolines. Note that
+ * when that happens, user is defined as 0 above. We need to
+ * set user to 1 to force calling userret() and do_ast().
*/
if (!TRAPF_USERMODE(framep)) {
/* Check for copyin/copyout fault. */
@@ -711,7 +713,8 @@
goto out;
}
goto dopanic;
- }
+ } else
+ user = 1;
ucode = va;
i = (rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV;
break;
==== //depot/projects/ia64/sys/vm/vm_map.c#54 (text+ko) ====
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $FreeBSD: src/sys/vm/vm_map.c,v 1.296 2003/04/30 19:18:09 alc Exp $
+ * $FreeBSD: src/sys/vm/vm_map.c,v 1.297 2003/06/07 02:29:17 alc Exp $
*/
/*
@@ -2143,9 +2143,7 @@
if (object->ref_count != 1 &&
(object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING &&
(object->type == OBJT_DEFAULT || object->type == OBJT_SWAP)) {
- VM_OBJECT_UNLOCK(object);
vm_object_collapse(object);
- VM_OBJECT_LOCK(object);
vm_object_page_remove(object, offidxstart, offidxend, FALSE);
if (object->type == OBJT_SWAP)
swap_pager_freespace(object, offidxstart, count);
@@ -2289,7 +2287,9 @@
if ((src_object->handle == NULL) &&
(src_object->type == OBJT_DEFAULT ||
src_object->type == OBJT_SWAP)) {
+ VM_OBJECT_LOCK(src_object);
vm_object_collapse(src_object);
+ VM_OBJECT_UNLOCK(src_object);
if ((src_object->flags & (OBJ_NOSPLIT|OBJ_ONEMAPPING)) == OBJ_ONEMAPPING) {
vm_object_split(src_entry);
src_object = src_entry->object.vm_object;
==== //depot/projects/ia64/sys/vm/vm_object.c#59 (text+ko) ====
@@ -61,7 +61,7 @@
* any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes.
*
- * $FreeBSD: src/sys/vm/vm_object.c,v 1.294 2003/06/05 20:55:27 alc Exp $
+ * $FreeBSD: src/sys/vm/vm_object.c,v 1.295 2003/06/07 02:29:17 alc Exp $
*/
/*
@@ -508,8 +508,8 @@
goto doterm;
}
object = robject;
- /* XXX */ VM_OBJECT_UNLOCK(object);
vm_object_collapse(object);
+ VM_OBJECT_UNLOCK(object);
continue;
}
VM_OBJECT_UNLOCK(robject);
@@ -1495,7 +1495,7 @@
void
vm_object_collapse(vm_object_t object)
{
- GIANT_REQUIRED;
+ VM_OBJECT_LOCK_ASSERT(object, MA_OWNED);
while (TRUE) {
vm_object_t backing_object;
@@ -1505,9 +1505,6 @@
*
* The object exists and the backing object exists.
*/
- if (object == NULL)
- break;
-
if ((backing_object = object->backing_object) == NULL)
break;
@@ -1536,7 +1533,7 @@
VM_OBJECT_UNLOCK(backing_object);
break;
}
-
+/* XXX */ VM_OBJECT_UNLOCK(object);
/*
* We know that we can either collapse the backing object (if
* the parent is the only reference to it) or (perhaps) have
@@ -1645,6 +1642,7 @@
*/
if (vm_object_backing_scan(object, OBSC_TEST_ALL_SHADOWED) == 0) {
VM_OBJECT_UNLOCK(backing_object);
+/* XXX */ VM_OBJECT_LOCK(object);
break;
}
@@ -1687,6 +1685,7 @@
/*
* Try again with this object's new backing object.
*/
+/* XXX */ VM_OBJECT_LOCK(object);
}
}
@@ -1801,9 +1800,7 @@
/*
* Try to collapse the object first
*/
- VM_OBJECT_UNLOCK(prev_object);
vm_object_collapse(prev_object);
- VM_OBJECT_LOCK(prev_object);
/*
* Can't coalesce if: . more than one reference . paged out . shadows
More information about the p4-projects
mailing list