[kaffe] KeyEvent -> JDK 1.4 patch (And longer explanation;)

Mon, 30 Sep 2002 15:42:40 +0300 (EEST)

  This message is in MIME format.  The first part should be readable text,
  while the remaining parts are likely unreadable without MIME-aware tools.
  Send mail to mime@docserver.cac.washington.edu for more info.

---559023410-758783491-1033389760=:13821
Content-Type: TEXT/PLAIN; charset=US-ASCII

This patch updates java.awt.event.KeyEvent to "sorta" JDK 1.4 spec. This
mostly involves a bunch of new key type defines, and is neccessary because
Swing for some reason now thinks Kaffe is Java2 compatible and so tries to
use them with Kaffe. This implementation has been checked with reflection
etc. to match Sun JDK 1.4.0 and IBM Java 1.3.0.

JDK 1.4 adds "Key locations". This class provides code for supporting
them, but since the Kaffe input layer core doesn't presently support them
at least directly, the patch has related functionality quoted out and
returns KEY_LOCATION_UNKNOWN for all events. This saves one int per
KeyEvent instance, which might be significant somewhere.

Speaking of space savings, this patch adds a non-trivial amount of static
key-defines, as well as code for getKeyText() and complexity for
isActionKey(). I submit that this would be a potential case for weighting
the advantages and costs involved in trying to support a JDK specific
class-lib build system. I think embedded use is still oen important
consideration for Kaffe, and Java2's code-bloat doesn't really help with
it. Unfortunately for decisions inside classes this would seem to mean
some kind of preprocessor with directives.

Another thought while doing the class checkup, I noticed that the
constructor functions do almost exactly same thing, but each one has been
separately typed in there. This is ofcourse good for performance, since
KeyEvent constructors will be called for all key-presses etc. and this
avoids one level of nested calls compared to each constructor making call
to "meta-constructor" with fixed attributes. Incidentally though, this is
use of the same pattern as I've suggested for HashMap.find(), which
several magnitudes more often used than KeyEven constructors. Hopefully
there will be some sort of common guidleine (not neccessarily a "rule") on
the use of code-duplication for performance-critical code-paths to avoid
nested calls.

Speaking of performance tunings, this patch uses a touch unconventional
code for isActionKey(). Optimizers that can optimize for expected keyboard
input are still far, far in the future, so I hope nobody objects on "Let's
optimize this in the VM for all code" to this :) Ofcourse, even so it's
just a guess on the frequency of letters checked, and my main incencitive
was to make the checks as compact as possible. They may be harder to read
than a straight list of which keys/events to consider actions, but I've
verified the results match Sun/IBM JDK's, so it doesn't particularily
matter. It's still at least as easy to figure out whether a specific key
is action or not even from the code.

For future work: With j2sdk1.4.0:
Exception in thread "main" java.lang.ExceptionInInitializerError
Caused by: java.lang.IllegalArgumentException: null source
        at java.util.EventObject.<init>(EventObject.java:34)
        at java.awt.AWTEvent.<init>(AWTEvent.java:225)
        at java.awt.event.ComponentEvent.<init>(ComponentEvent.java:94)
        at java.awt.event.InputEvent.<init>(InputEvent.java:179)
        at java.awt.event.KeyEvent.<init>(KeyEvent.java:858)
        at java.awt.event.KeyEvent.<init>(KeyEvent.java:914)
        at java.awt.event.KeyEvent.<init>(KeyEvent.java:923)

Adding this exception to Kaffe should be easy, but I didn't bother
clumping it together with this patch. Another thing is actually
integrating the JDK 1.4 key-location system to Kaffe core. I didn't check
that all key-modifiers work the same, but I assume the old implementation
had it right. CHAR_UNDEFINED has different value from JDK's, but I didn't
change this, as it'd require checking with input code, and it'll work as
long as people use the defined constants as intended. I have not had an
opportunity to check that the keys like VK_F20 or VK_CUT actually work
yet, this class just guarantess they're defined and Kaffe doesn't bowl
over because of that.

And I'll be unlikely to do that work, because this patch is enough to get
our software work with Kaffe ;) (Actually, it's fairly lot more than just
what's needed, since I wanted to make sure all the constants were there
and consistent).

 -Jukka Santala

---559023410-758783491-1033389760=:13821
Content-Type: TEXT/PLAIN; charset=US-ASCII; name="kaffe-donwulff-keyevent.patch"
Content-Transfer-Encoding: BASE64
Content-ID: <Pine.GSO.4.44.0209301542400.13821@morphine.tml.hut.fi>
Content-Description: 
Content-Disposition: attachment; filename="kaffe-donwulff-keyevent.patch"

SW5kZXg6IGxpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L2V2ZW50L0tleUV2
ZW50LmphdmENCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NClJDUyBmaWxlOiAv
Y3ZzL2thZmZlL2thZmZlL2xpYnJhcmllcy9qYXZhbGliL2phdmEvYXd0L2V2
ZW50L0tleUV2ZW50LmphdmEsdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjgN
CmRpZmYgLXUgLXIxLjggS2V5RXZlbnQuamF2YQ0KLS0tIGxpYnJhcmllcy9q
YXZhbGliL2phdmEvYXd0L2V2ZW50L0tleUV2ZW50LmphdmEJMTMgTWFyIDIw
MDIgMjE6MDE6NTUgLTAwMDAJMS44DQorKysgbGlicmFyaWVzL2phdmFsaWIv
amF2YS9hd3QvZXZlbnQvS2V5RXZlbnQuamF2YQkzMCBTZXAgMjAwMiAxMjow
MToyNSAtMDAwMA0KQEAgLTE2LDYgKzE2LDcgQEANCiAgIGV4dGVuZHMgSW5w
dXRFdmVudA0KIHsNCiAJcHJvdGVjdGVkIGludCBrZXlDb2RlOw0KKy8vCXBy
b3RlY3RlZCBpbnQga2V5TG9jYXRpb247IC8vIEpESyAxLjQNCiAJcHJvdGVj
dGVkIGNoYXIga2V5Q2hhcjsNCiAJcHJpdmF0ZSBzdGF0aWMgZmluYWwgbG9u
ZyBzZXJpYWxWZXJzaW9uVUlEID0gLTIzNTIxMzA5NTMwMjgxMjY5NTRMOw0K
IAlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBLRVlfRklSU1QgPSA0MDA7DQpA
QCAtNDQsNiArNDUsNyBAQA0KIAlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBW
S19SSUdIVCA9IDB4Mjc7DQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZL
X0RPV04gPSAweDI4Ow0KIAlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19D
T01NQSA9IDB4MkM7DQorCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX01J
TlVTID0gMHgyRDsgLy8gMS4yDQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50
IFZLX1BFUklPRCA9IDB4MkU7DQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50
IFZLX1NMQVNIID0gMHgyRjsNCiAJZmluYWwgcHVibGljIHN0YXRpYyBpbnQg
VktfMCA9IDB4MzA7DQpAQCAtOTksMTAgKzEwMSwxNCBAQA0KIAlmaW5hbCBw
dWJsaWMgc3RhdGljIGludCBWS19OVU1QQUQ5ID0gMHg2OTsNCiAJZmluYWwg
cHVibGljIHN0YXRpYyBpbnQgVktfTVVMVElQTFkgPSAweDZBOw0KIAlmaW5h
bCBwdWJsaWMgc3RhdGljIGludCBWS19BREQgPSAweDZCOw0KLQlmaW5hbCBw
dWJsaWMgc3RhdGljIGludCBWS19TRVBBUkFURVIgPSAweDZDOw0KKwlmaW5h
bCBwdWJsaWMgc3RhdGljIGludCBWS19TRVBBUkFURVIgPSAweDZDOyAvLyAx
LjEgY29tcGF0aWJpbGl0eSAobWlzc3BlbGxlZCkNCisJZmluYWwgcHVibGlj
IHN0YXRpYyBpbnQgVktfU0VQQVJBVE9SID0gMHg2QzsgLy8gMS40DQogCWZp
bmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX1NVQlRSQUNUID0gMHg2RDsNCiAJ
ZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfREVDSU1BTCA9IDB4NkU7DQog
CWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0RJVklERSA9IDB4NkY7DQor
CWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0RFTEVURSA9IDB4N0Y7DQor
CWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX05VTV9MT0NLID0gMHg5MDsN
CisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfU0NST0xMX0xPQ0sgPSAw
eDkxOw0KIAlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19GMSA9IDB4NzA7
DQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0YyID0gMHg3MTsNCiAJ
ZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfRjMgPSAweDcyOw0KQEAgLTEx
NSwxNSArMTIxLDY3IEBADQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZL
X0YxMCA9IDB4Nzk7DQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0Yx
MSA9IDB4N0E7DQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0YxMiA9
IDB4N0I7DQotCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0RFTEVURSA9
IDB4N0Y7DQotCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX05VTV9MT0NL
ID0gMHg5MDsNCi0JZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfU0NST0xM
X0xPQ0sgPSAweDkxOw0KKw0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBW
S19GMTMgPSAweEYwMDA7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGlj
IGludCBWS19GMTQgPSAweEYwMDE7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMg
c3RhdGljIGludCBWS19GMTUgPSAweEYwMDI7IC8vIDEuMg0KKwlmaW5hbCBw
dWJsaWMgc3RhdGljIGludCBWS19GMTYgPSAweEYwMDM7IC8vIDEuMg0KKwlm
aW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19GMTcgPSAweEYwMDQ7IC8vIDEu
Mg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19GMTggPSAweEYwMDU7
IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19GMTkgPSAw
eEYwMDY7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19G
MjAgPSAweEYwMDc7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGlu
dCBWS19GMjEgPSAweEYwMDg7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3Rh
dGljIGludCBWS19GMjIgPSAweEYwMDk7IC8vIDEuMg0KKwlmaW5hbCBwdWJs
aWMgc3RhdGljIGludCBWS19GMjMgPSAweEYwMEE7IC8vIDEuMg0KKwlmaW5h
bCBwdWJsaWMgc3RhdGljIGludCBWS19GMjQgPSAweEYwMEI7IC8vIDEuMg0K
Kw0KIAlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19QUklOVFNDUkVFTiA9
IDB4OUE7DQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0lOU0VSVCA9
IDB4OUI7DQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0hFTFAgPSAw
eDlDOw0KIAlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19NRVRBID0gMHg5
RDsNCiAJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfQkFDS19RVU9URSA9
IDB4QzA7DQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX1FVT1RFID0g
MHhERTsNCisNCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfS1BfVVAg
PSAweEUwOyAvLyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktf
S1BfRE9XTiA9IDB4RTE7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGlj
IGludCBWS19LUF9MRUZUID0gMHhFMjsgLy8gMS4yDQorCWZpbmFsIHB1Ymxp
YyBzdGF0aWMgaW50IFZLX0tQX1JJR0hUID0gMHhFMzsgLy8gMS4yDQorCWZp
bmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0RFQURfR1JBVkUgPSAweDgwOyAv
LyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfREVBRF9BQ1VU
RSA9IDB4ODE7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBW
S19ERUFEX0NJUkNVTUZMRVggPSAweDgyOyAvLyAxLjINCisJZmluYWwgcHVi
bGljIHN0YXRpYyBpbnQgVktfREVBRF9USUxERSA9IDB4ODM7IC8vIDEuMg0K
KwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19ERUFEX01BQ1JPTiA9IDB4
ODQ7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19ERUFE
X0JSRVZFID0gMHg4NTsgLy8gMS4yDQorCWZpbmFsIHB1YmxpYyBzdGF0aWMg
aW50IFZLX0RFQURfQUJPVkVET1QgPSAweDg2OyAvLyAxLjINCisJZmluYWwg
cHVibGljIHN0YXRpYyBpbnQgVktfREVBRF9ESUFFUkVTSVMgPSAweDg3OyAv
LyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfREVBRF9BQk9W
RVJJTkcgPSAweDg4OyAvLyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBp
bnQgVktfREVBRF9ET1VCTEVBQ1VURSA9IDB4ODk7IC8vIDEuMg0KKwlmaW5h
bCBwdWJsaWMgc3RhdGljIGludCBWS19ERUFEX0NBUk9OID0gMHg4QTsgLy8g
MS4yDQorCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0RFQURfQ0VESUxM
QSA9IDB4OEI7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBW
S19ERUFEX09HT05FSyA9IDB4OEM7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMg
c3RhdGljIGludCBWS19ERUFEX0lPVEEgPSAweDhEOyAvLyAxLjINCisJZmlu
YWwgcHVibGljIHN0YXRpYyBpbnQgVktfREVBRF9WT0lDRURfU09VTkQgPSAw
eDhFOyAvLyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfREVB
RF9TRU1JVk9JQ0VEX1NPVU5EID0gMHg4RjsgLy8gMS4yDQorCWZpbmFsIHB1
YmxpYyBzdGF0aWMgaW50IFZLX0FNUEVSU0FORCA9IDB4OTY7IC8vIDEuMg0K
KwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19BU1RFUklTSyA9IDB4OTc7
IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19RVU9URURC
TCA9IDB4OTg7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBW
S19MRVNTID0gMHg5OTsgLy8gMS4yDQorCWZpbmFsIHB1YmxpYyBzdGF0aWMg
aW50IFZLX0dSRUFURVIgPSAweEEwOyAvLyAxLjINCisJZmluYWwgcHVibGlj
IHN0YXRpYyBpbnQgVktfQlJBQ0VMRUZUID0gMHhBMTsgLy8gMS4yDQorCWZp
bmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0JSQUNFUklHSFQgPSAweEEyOyAv
LyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfQVQgPSAweDIw
MDsgLy8gMS4yDQorCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX0NPTE9O
ID0gMHgyMDE7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBW
S19DSVJDVU1GTEVYID0gMHgyMDI7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMg
c3RhdGljIGludCBWS19ET0xMQVIgPSAweDIwMzsgLy8gMS4yDQorCWZpbmFs
IHB1YmxpYyBzdGF0aWMgaW50IFZLX0VVUk9fU0lHTiA9IDB4MjA0OyAvLyAx
LjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfRVhDTEFNQVRJT05f
TUFSSyA9IDB4MjA1OyAvLyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBp
bnQgVktfSU5WRVJURURfRVhDTEFNQVRJT05fTUFSSyA9IDB4MjA2OyAvLyAx
LjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfTEVGVF9QQVJFTlRI
RVNJUyA9IDB4MjA3OyAvLyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBp
bnQgVktfTlVNQkVSX1NJR04gPSAweDIwODsgLy8gMS4yDQorCWZpbmFsIHB1
YmxpYyBzdGF0aWMgaW50IFZLX1BMVVMgPSAweDIwOTsgLy8gMS4yDQorCWZp
bmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX1JJR0hUX1BBUkVOVEhFU0lTID0g
MHgyMEE7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19V
TkRFUlNDT1JFID0gMHgyMEI7IC8vIDEuMg0KKw0KIAlmaW5hbCBwdWJsaWMg
c3RhdGljIGludCBWS19GSU5BTCA9IDB4MTg7DQogCWZpbmFsIHB1YmxpYyBz
dGF0aWMgaW50IFZLX0NPTlZFUlQgPSAweDFDOw0KIAlmaW5hbCBwdWJsaWMg
c3RhdGljIGludCBWS19OT05DT05WRVJUID0gMHgxRDsNCkBAIC0xMzEsOSAr
MTg5LDQxIEBADQogCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX01PREVD
SEFOR0UgPSAweDFGOw0KIAlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19L
QU5BID0gMHgxNTsNCiAJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfS0FO
SkkgPSAweDE5Ow0KKw0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19B
TFBIQU5VTUVSSUMgPSAweEYwOyAvLyAxLjINCisJZmluYWwgcHVibGljIHN0
YXRpYyBpbnQgVktfS0FUQUtBTkEgPSAweEYxOyAvLyAxLjINCisJZmluYWwg
cHVibGljIHN0YXRpYyBpbnQgVktfSElSQUdBTkEgPSAweEYyOyAvLyAxLjIN
CisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfRlVMTF9XSURUSCA9IDB4
RjM7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19IQUxG
X1dJRFRIID0gMHhGNDsgLy8gMS4yDQorCWZpbmFsIHB1YmxpYyBzdGF0aWMg
aW50IFZLX1JPTUFOX0NIQVJBQ1RFUlMgPSAweEY1OyAvLyAxLjINCisJZmlu
YWwgcHVibGljIHN0YXRpYyBpbnQgVktfQUxMX0NBTkRJREFURVMgPSAweDEw
MDsgLy8gMS4yDQorCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZLX1BSRVZJ
T1VTX0NBTkRJREFURSA9IDB4MTAxOyAvLyAxLjINCisJZmluYWwgcHVibGlj
IHN0YXRpYyBpbnQgVktfQ09ERV9JTlBVVCA9IDB4MTAyOyAvLyAxLjINCisJ
ZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfSkFQQU5FU0VfS0FUQUtBTkEg
PSAweDEwMzsgLy8gMS4yDQorCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZL
X0pBUEFORVNFX0hJUkFHQU5BID0gMHgxMDQ7IC8vIDEuMg0KKwlmaW5hbCBw
dWJsaWMgc3RhdGljIGludCBWS19KQVBBTkVTRV9ST01BTiA9IDB4MTA1OyAv
LyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfS0FOQV9MT0NL
ID0gMHgxMDY7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBW
S19JTlBVVF9NRVRIT0RfT05fT0ZGID0gMHgxMDc7IC8vIDEuMg0KKwlmaW5h
bCBwdWJsaWMgc3RhdGljIGludCBWS19DVVQgPSAweEZGRDE7IC8vIDEuMg0K
KwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19DT1BZID0gMHhGRkNEOyAv
LyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfUEFTVEUgPSAw
eEZGQ0Y7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19V
TkRPID0gMHhGRkNCOyAvLyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBp
bnQgVktfQUdBSU4gPSAweEZGQzk7IC8vIDEuMg0KKwlmaW5hbCBwdWJsaWMg
c3RhdGljIGludCBWS19GSU5EID0gMHhGRkQwOyAvLyAxLjINCisJZmluYWwg
cHVibGljIHN0YXRpYyBpbnQgVktfUFJPUFMgPSAweEZGQ0E7IC8vIDEuMg0K
KwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBWS19TVE9QID0gMHhGRkM4OyAv
LyAxLjINCisJZmluYWwgcHVibGljIHN0YXRpYyBpbnQgVktfQ09NUE9TRSA9
IDB4RkYyMDsgLy8gMS4yDQorCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IFZL
X0FMVF9HUkFQSCA9IDB4RkY3RTsgLy8gMS4yDQorDQogCWZpbmFsIHB1Ymxp
YyBzdGF0aWMgaW50IFZLX1VOREVGSU5FRCA9IDB4MDsNCiAJZmluYWwgcHVi
bGljIHN0YXRpYyBjaGFyIENIQVJfVU5ERUZJTkVEID0gMHhmZmZmOw0KIA0K
KwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBLRVlfTE9DQVRJT05fVU5LTk9X
TiA9IDA7IC8vIDEuNA0KKwlmaW5hbCBwdWJsaWMgc3RhdGljIGludCBLRVlf
TE9DQVRJT05fU1RBTkRBUkQgPSAxOyAvLyAxLjQNCisJZmluYWwgcHVibGlj
IHN0YXRpYyBpbnQgS0VZX0xPQ0FUSU9OX0xFRlQgPSAyOyAvLyAxLjQNCisJ
ZmluYWwgcHVibGljIHN0YXRpYyBpbnQgS0VZX0xPQ0FUSU9OX1JJR0hUID0g
MzsgLy8gMS40DQorCWZpbmFsIHB1YmxpYyBzdGF0aWMgaW50IEtFWV9MT0NB
VElPTl9OVU1QQUQgPSA0OyAvLyAxLjQNCisNCiBwdWJsaWMgS2V5RXZlbnQg
KCBDb21wb25lbnQgc3JjLCBpbnQgZXZ0SWQsIGxvbmcgdGltZSwgaW50IG1v
ZHMsIGludCBrQ29kZSkgew0KIAlzdXBlciggc3JjLCBldnRJZCk7DQogCQ0K
QEAgLTE0MSw2ICsyMzEsNyBAQA0KIAltb2RpZmllcnMgPSBtb2RzOw0KIAlr
ZXlDb2RlID0ga0NvZGU7DQogCWtleUNoYXIgPSAoY2hhcilrQ29kZTsNCisv
LwlrZXlMb2NhdGlvbiA9IEtFWV9MT0NBVElPTl9VTktOT1dOOw0KIH0NCiAN
CiBwdWJsaWMgS2V5RXZlbnQgKCBDb21wb25lbnQgc3JjLCBpbnQgZXZ0SWQs
IGxvbmcgdGltZSwgaW50IG1vZHMsIGludCBrQ29kZSwgY2hhciBrQ2hhciAp
IHsNCkBAIC0xNTAsNiArMjQxLDE3IEBADQogCW1vZGlmaWVycyA9IG1vZHM7
DQogCWtleUNvZGUgPSBrQ29kZTsNCiAJa2V5Q2hhciA9IGtDaGFyOw0KKy8v
CWtleUxvY2F0aW9uID0gS0VZX0xPQ0FUSU9OX1VOS05PV047DQorfQ0KKw0K
K3B1YmxpYyBLZXlFdmVudCAoIENvbXBvbmVudCBzcmMsIGludCBldnRJZCwg
bG9uZyB0aW1lLCBpbnQgbW9kcywgaW50IGtDb2RlLCBjaGFyIGtDaGFyLCBp
bnQga0xvYyApIHsNCisJc3VwZXIoIHNyYywgZXZ0SWQpOw0KKwkNCisJd2hl
biA9IHRpbWU7DQorCW1vZGlmaWVycyA9IG1vZHM7DQorCWtleUNvZGUgPSBr
Q29kZTsNCisJa2V5Q2hhciA9IGtDaGFyOw0KKy8vCWtleUxvY2F0aW9uID0g
a0xvYzsNCiB9DQogDQogcHVibGljIGNoYXIgZ2V0S2V5Q2hhcigpIHsNCkBA
IC0yMTUsNiArMzE3LDExIEBADQogCWNhc2UgVktfUklHSFQ6ICAgICAgcmV0
dXJuICJSaWdodCI7DQogCWNhc2UgVktfRE9XTjogICAgICAgcmV0dXJuICJE
b3duIjsNCiANCisJY2FzZSBWS19LUF9MRUZUOiAgICByZXR1cm4gIkxlZnQi
Ow0KKwljYXNlIFZLX0tQX1VQOiAgICAgIHJldHVybiAiVXAiOw0KKwljYXNl
IFZLX0tQX1JJR0hUOiAgIHJldHVybiAiUmlnaHQiOw0KKwljYXNlIFZLX0tQ
X0RPV046ICAgIHJldHVybiAiRG93biI7DQorDQogCWNhc2UgVktfTVVMVElQ
TFk6ICAgcmV0dXJuICJOdW1QYWQgKiI7DQogCWNhc2UgVktfQUREOiAgICAg
ICAgcmV0dXJuICJOdW1QYWQgKyI7DQogCWNhc2UgVktfU0VQQVJBVEVSOiAg
cmV0dXJuICJOdW1QYWQgLCI7DQpAQCAtMjM0LDYgKzM0MSwyMCBAQA0KIAlj
YXNlIFZLX0YxMDogICAgICAgIHJldHVybiAiRjEwIjsNCiAJY2FzZSBWS19G
MTE6ICAgICAgICByZXR1cm4gIkYxMSI7DQogCWNhc2UgVktfRjEyOiAgICAg
ICAgcmV0dXJuICJGMTIiOw0KKwkvLyBKREsgMS4yKw0KKwljYXNlIFZLX0Yx
MzogICAgICAgIHJldHVybiAiRjEzIjsNCisJY2FzZSBWS19GMTQ6ICAgICAg
ICByZXR1cm4gIkYxNCI7DQorCWNhc2UgVktfRjE1OiAgICAgICAgcmV0dXJu
ICJGMTUiOw0KKwljYXNlIFZLX0YxNjogICAgICAgIHJldHVybiAiRjE2IjsN
CisJY2FzZSBWS19GMTc6ICAgICAgICByZXR1cm4gIkYxNyI7DQorCWNhc2Ug
VktfRjE4OiAgICAgICAgcmV0dXJuICJGMTgiOw0KKwljYXNlIFZLX0YxOTog
ICAgICAgIHJldHVybiAiRjE5IjsNCisJY2FzZSBWS19GMjA6ICAgICAgICBy
ZXR1cm4gIkYyMCI7DQorCWNhc2UgVktfRjIxOiAgICAgICAgcmV0dXJuICJG
MjEiOw0KKwljYXNlIFZLX0YyMjogICAgICAgIHJldHVybiAiRjIyIjsNCisJ
Y2FzZSBWS19GMjM6ICAgICAgICByZXR1cm4gIkYyMyI7DQorCWNhc2UgVktf
RjI0OiAgICAgICAgcmV0dXJuICJGMjQiOw0KKw0KIAljYXNlIFZLX0RFTEVU
RTogICAgIHJldHVybiAiRGVsZXRlIjsNCiAJY2FzZSBWS19OVU1fTE9DSzog
ICByZXR1cm4gIk51bSBMb2NrIjsNCiAJY2FzZSBWS19TQ1JPTExfTE9DSzog
cmV0dXJuICJTY3JvbGwgTG9jayI7DQpAQCAtMjUxLDYgKzM3Miw2OCBAQA0K
IAljYXNlIFZLX01PREVDSEFOR0U6IHJldHVybiAiTW9kZSBDaGFuZ2UiOw0K
IAljYXNlIFZLX0tBTkE6ICAgICAgIHJldHVybiAiS2FuYSI7DQogCWNhc2Ug
VktfS0FOSkk6ICAgICAgcmV0dXJuICJLYW5qaSI7DQorDQorCS8vIEphdmEy
IGFkZGl0aW9ucw0KKwljYXNlIFZLX0FHQUlOOgkJcmV0dXJuICJBZ2FpbiI7
DQorCWNhc2UgVktfQUxMX0NBTkRJREFURVM6CXJldHVybiAiQWxsIENhbmRp
ZGF0ZXMiOw0KKwljYXNlIFZLX0FMUEhBTlVNRVJJQzoJcmV0dXJuICJBbHBo
YW51bWVyaWMiOw0KKwljYXNlIFZLX0FMVF9HUkFQSDoJcmV0dXJuICJBbHQg
R3JhcGgiOw0KKwljYXNlIFZLX0FNUEVSU0FORDoJcmV0dXJuICJBbXBlcnNh
bmQiOw0KKwljYXNlIFZLX0FTVEVSSVNLOglyZXR1cm4gIkFzdGVyaXNrIjsN
CisJY2FzZSBWS19BVDoJCXJldHVybiAiQXQiOw0KKwljYXNlIFZLX0JSQUNF
TEVGVDoJcmV0dXJuICJMZWZ0IEJyYWNlIjsNCisJY2FzZSBWS19CUkFDRVJJ
R0hUOglyZXR1cm4gIlJpZ2h0IEJyYWNlIjsNCisJY2FzZSBWS19DSVJDVU1G
TEVYOglyZXR1cm4gIkNpcmN1bWZsZXgiOw0KKwljYXNlIFZLX0NPREVfSU5Q
VVQ6CXJldHVybiAiQ29kZSBJbnB1dCI7DQorCWNhc2UgVktfQ09MT046CQly
ZXR1cm4gIkNvbG9uIjsNCisJY2FzZSBWS19DT01QT1NFOglyZXR1cm4gIkNv
bXBvc2UgIjsNCisJY2FzZSBWS19DT1BZOgkJcmV0dXJuICJDb3B5IjsNCisJ
Y2FzZSBWS19DVVQ6CQlyZXR1cm4gIkN1dCI7DQorCWNhc2UgVktfREVBRF9B
Qk9WRURPVDoJcmV0dXJuICJEZWFkIEFib3ZlIERvdCI7DQorCWNhc2UgVktf
REVBRF9BQk9WRVJJTkc6CXJldHVybiAiRGVhZCBBYm92ZSBSaW5nIjsNCisJ
Y2FzZSBWS19ERUFEX0FDVVRFOglyZXR1cm4gIkRlYWQgQWN1dGUiOw0KKwlj
YXNlIFZLX0RFQURfQlJFVkU6CXJldHVybiAiRGVhZCBCcmV2ZSI7DQorCWNh
c2UgVktfREVBRF9DQVJPTjoJcmV0dXJuICJEZWFkIENhcm9uIjsNCisJY2Fz
ZSBWS19ERUFEX0NFRElMTEE6CXJldHVybiAiRGVhZCBDZWRpbGxhIjsNCisJ
Y2FzZSBWS19ERUFEX0NJUkNVTUZMRVg6IHJldHVybiAiRGVhZCBDaXJjdW1m
bGV4IjsNCisJY2FzZSBWS19ERUFEX0RJQUVSRVNJUzoJcmV0dXJuICJEZWFk
IERpYWVyZXNpcyI7DQorCWNhc2UgVktfREVBRF9ET1VCTEVBQ1VURTogcmV0
dXJuICJEZWFkIERvdWJsZSBBY3V0ZSI7DQorCWNhc2UgVktfREVBRF9HUkFW
RToJcmV0dXJuICJEZWFkIEdyYXZlIjsNCisJY2FzZSBWS19ERUFEX0lPVEE6
CXJldHVybiAiRGVhZCBJb3RhIjsNCisJY2FzZSBWS19ERUFEX01BQ1JPTjoJ
cmV0dXJuICJEZWFkIE1hY3JvbiI7DQorCWNhc2UgVktfREVBRF9PR09ORUs6
CXJldHVybiAiRGVhZCBPZ29uZWsiOw0KKwljYXNlIFZLX0RFQURfU0VNSVZP
SUNFRF9TT1VORDogcmV0dXJuICJEZWFkIFNlbWl2b2ljZWQgU291bmQiOw0K
KwljYXNlIFZLX0RFQURfVElMREU6CXJldHVybiAiRGVhZCBUaWxkZSI7DQor
CWNhc2UgVktfREVBRF9WT0lDRURfU09VTkQ6IHJldHVybiAiRGVhZCBWb2lj
ZWQgU291bmQiOw0KKwljYXNlIFZLX0RPTExBUjoJCXJldHVybiAiRG9sbGFy
IjsNCisJY2FzZSBWS19FVVJPX1NJR046CXJldHVybiAiRXVybyI7DQorCWNh
c2UgVktfRVhDTEFNQVRJT05fTUFSSzogcmV0dXJuICJFeGNsYW1hdGlvbiBN
YXJrIjsNCisJY2FzZSBWS19GSU5EOgkJcmV0dXJuICJGaW5kIjsNCisJY2Fz
ZSBWS19GVUxMX1dJRFRIOglyZXR1cm4gIkZ1bGwtV2lkdGgiOw0KKwljYXNl
IFZLX0dSRUFURVI6CXJldHVybiAiR3JlYXRlciI7DQorCWNhc2UgVktfSEFM
Rl9XSURUSDoJcmV0dXJuICJIYWxmLVdpZHRoIjsNCisJY2FzZSBWS19ISVJB
R0FOQToJcmV0dXJuICJIaXJhZ2FuYSI7DQorCWNhc2UgVktfSU5QVVRfTUVU
SE9EX09OX09GRjogcmV0dXJuICJJbnB1dCBNZXRob2QgT24vT2ZmIjsNCisJ
Y2FzZSBWS19JTlZFUlRFRF9FWENMQU1BVElPTl9NQVJLOiByZXR1cm4gIklu
dmVydGVkIEV4Y2xhbWF0aW9uIE1hcmsiOw0KKwljYXNlIFZLX0pBUEFORVNF
X0hJUkFHQU5BOiByZXR1cm4gIkphcGFuZXNlIEhpcmFnYW5hIjsNCisJY2Fz
ZSBWS19KQVBBTkVTRV9LQVRBS0FOQTogcmV0dXJuICJKYXBhbmVzZSBLYXRh
a2FuYSI7DQorCWNhc2UgVktfSkFQQU5FU0VfUk9NQU46CXJldHVybiAiSmFw
YW5lc2UgUm9tYW4iOw0KKwljYXNlIFZLX0tBTkFfTE9DSzoJcmV0dXJuICJL
YW5hIExvY2siOw0KKwljYXNlIFZLX0tBVEFLQU5BOglyZXR1cm4gIkthdGFr
YW5hIjsNCisJY2FzZSBWS19MRUZUX1BBUkVOVEhFU0lTOiByZXR1cm4gIkxl
ZnQgUGFyZW50aGVzaXMiOw0KKwljYXNlIFZLX0xFU1M6CQlyZXR1cm4gIkxl
c3MiOw0KKwljYXNlIFZLX01JTlVTOgkJcmV0dXJuICJNaW51cyI7DQorCWNh
c2UgVktfTlVNQkVSX1NJR046CXJldHVybiAiTnVtYmVyIFNpZ24iOw0KKwlj
YXNlIFZLX1BBU1RFOgkJcmV0dXJuICJQYXN0ZSI7DQorCWNhc2UgVktfUExV
UzoJCXJldHVybiAiUGx1cyI7DQorCWNhc2UgVktfUFJFVklPVVNfQ0FORElE
QVRFOiByZXR1cm4gIlByZXZpb3VzIENhbmRpZGF0ZSI7DQorCWNhc2UgVktf
UFJPUFM6CQlyZXR1cm4gIlByb3BzIjsNCisJY2FzZSBWS19RVU9URURCTDoJ
cmV0dXJuICJEb3VibGUgUXVvdGUiOw0KKwljYXNlIFZLX1JJR0hUX1BBUkVO
VEhFU0lTOiByZXR1cm4gIlJpZ2h0IFBhcmVudGhlc2lzIjsNCisJY2FzZSBW
S19ST01BTl9DSEFSQUNURVJTOiByZXR1cm4gIlJvbWFuIENoYXJhY3RlcnMi
Ow0KKwljYXNlIFZLX1NUT1A6CQlyZXR1cm4gIlN0b3AiOw0KKwljYXNlIFZL
X1VOREVSU0NPUkU6CXJldHVybiAiVW5kZXJzY29yZSI7DQorCWNhc2UgVktf
VU5ETzoJCXJldHVybiAiVW5kbyI7DQogCX0NCiANCiAJaWYgKCBrZXlDb2Rl
ID49IFZLX05VTVBBRDAgJiYga2V5Q29kZSA8PSBWS19OVU1QQUQ5ICkgew0K
QEAgLTI4MiwxMCArNDY1LDIzIEBADQogcHVibGljIGJvb2xlYW4gaXNBY3Rp
b25LZXkgKCkgew0KIAlpbnQga2MgPSBrZXlDb2RlOw0KIA0KLQlpZiAoIChr
YyA+PSBWS19QQVVTRSkgJiYgKGtjIDw9IFZLX0NBUFNfTE9DSykgKSByZXR1
cm4gdHJ1ZTsNCi0JaWYgKCAoa2MgPj0gVktfUEFHRV9VUCkgJiYgKGtjIDw9
IFZLX0RPV04pICkgcmV0dXJuIHRydWU7DQotCWlmICggKGtjID49IFZLX0Yx
KSAmJiAoa2MgPD0gVktfRjEyKSApIHJldHVybiB0cnVlOw0KLQlpZiAoIChr
YyA+PSBWS19OVU1fTE9DSykgJiYgKGtjIDw9IFZLX0lOU0VSVCkgKSByZXR1
cm4gdHJ1ZTsNCisJLy8gUG9wIG91dCBtb3N0IGNvbW1vbiBhbHBoYW51bWVy
aWNzIGZpcnN0DQorCWlmICgga2MgPT0gVktfU1BBQ0UgKSByZXR1cm4gZmFs
c2U7IC8vIFNwYWNlLWJhcg0KKwlpZiAoIChrYyA+IFZLX0RPV04pICYmIChr
YyA8IFZLX0YxKSApIHJldHVybiBmYWxzZTsgLy8gQWxwaGFudW0NCisJaWYg
KCBrYyA8IFZLX1BBVVNFICkgcmV0dXJuIGZhbHNlOyAvLyBOZXdsaW5lDQor
CWlmICggKGtjID4gVktfS0FOSkkpICYmIChrYyA8IFZLX0NPTlZFUlQpICkg
cmV0dXJuIGZhbHNlOyAvLyBFc2NhcGUNCisJaWYgKCAoa2MgPiBWS19LQU5B
KSAmJiAoa2MgPCBWS19GSU5BTCkgKSByZXR1cm4gZmFsc2U7IC8vIE5vbmUN
CisJaWYgKCBrYyA8PSBWS19GMTIgKSByZXR1cm4gdHJ1ZTsgLy8gRXZlcnl0
aGluZyBlbHNlIGNvbW1vbg0KKw0KKwlpZiAoIChrYyA+PSBWS19OVU1fTE9D
SykgJiYgKGtjIDw9IFZLX1NDUk9MTF9MT0NLKSApIHJldHVybiB0cnVlOw0K
KwlpZiAoIChrYyA+PSBWS19QUklOVFNDUkVFTikgJiYgKGtjIDw9IFZLX0hF
TFApICkgcmV0dXJuIHRydWU7DQorCWlmICggKGtjID49IFZLX0tQX1VQKSAm
JiAoa2MgPD0gVktfS1BfUklHSFQpICkgcmV0dXJuIHRydWU7DQorCWlmICgg
KGtjID49IFZLX0FMUEhBTlVNRVJJQykgJiYgKGtjIDw9IFZLX1JPTUFOX0NI
QVJBQ1RFUlMpICkgcmV0dXJuIHRydWU7DQorCWlmICggKGtjID49IFZLX0FM
TF9DQU5ESURBVEVTKSAmJiAoa2MgPD0gVktfSU5QVVRfTUVUSE9EX09OX09G
RikgKSByZXR1cm4gdHJ1ZTsNCisJaWYgKCAoa2MgPj0gVktfRjEzKSAmJiAo
a2MgPD0gVktfRjI0KSApIHJldHVybiB0cnVlOw0KKwlpZiAoIChrYyA+PSBW
S19TVE9QKSAmJiAoa2MgPD0gVktfVU5ETykgKSByZXR1cm4gdHJ1ZTsNCisJ
aWYgKCBrYyA9PSBWS19DT1BZICkgcmV0dXJuIHRydWU7DQorCWlmICggKGtj
ID49IFZLX1BBU1RFKSAmJiAoa2MgPD0gVktfQ1VUKSApIHJldHVybiB0cnVl
Ow0KIA0KIAlyZXR1cm4gZmFsc2U7DQogfQ0KQEAgLTMyMSw2ICs1MTcsMTEg
QEANCiAJfQ0KIAkNCiAJcmV0dXJuIHM7DQorfQ0KKw0KK3B1YmxpYyBpbnQg
Z2V0S2V5TG9jYXRpb24oKSB7DQorLy8JcmV0dXJuIGtleUxvY2F0aW9uOw0K
KwlyZXR1cm4gS0VZX0xPQ0FUSU9OX1VOS05PV047DQogfQ0KIA0KIHB1Ymxp
YyB2b2lkIHNldEtleUNoYXIgKCBjaGFyIGtDaGFyICkgew0K
---559023410-758783491-1033389760=:13821--