Content-Type: multipart/mixed; boundary="===============8900295346076012731==" MIME-Version: 1.0 From: Jung-uk Kim Subject: [Devel] [PATCH] Repair predefined Package -> Buffer Date: Fri, 04 Sep 2009 18:10:08 -0400 Message-ID: <200909041810.10355.jkim@FreeBSD.org> List-ID: To: devel@acpica.org --===============8900295346076012731== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable One of the most common mistake of _FDE is returning Package instead of = Buffer of five 32-bit integers. The attached patch repairs the case. = Do you think it is a reasonable fix? Basically, I want to get rid of = a quirk handling in FreeBSD. :-) Thanks! Jung-uk Kim --===============8900295346076012731== Content-Type: text/plain MIME-Version: 1.0 Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="nsrepair.diff" LS0tIG5zcmVwYWlyLmMub3JpZwkyMDA5LTA5LTAyIDE0OjI1OjE5LjAwMDAwMDAwMCAtMDQwMAor KysgbnNyZXBhaXIuYwkyMDA5LTA5LTA0IDE3OjUxOjAxLjAwMDAwMDAwMCAtMDQwMApAQCAtMTUy LDcgKzE1Miw5IEBACiB7CiAgICAgQUNQSV9PUEVSQU5EX09CSkVDVCAgICAgKlJldHVybk9iamVj dCA9ICpSZXR1cm5PYmplY3RQdHI7CiAgICAgQUNQSV9PUEVSQU5EX09CSkVDVCAgICAgKk5ld09i amVjdDsKKyAgICBVSU5UOCAgICAgICAgICAgICAgICAgICAqQnVmZmVyOwogICAgIEFDUElfU0la RSAgICAgICAgICAgICAgIExlbmd0aDsKKyAgICBVSU5UMzIgICAgICAgICAgICAgICAgICBDb3Vu dCwgVmFsdWU7CiAKIAogICAgIHN3aXRjaCAoUmV0dXJuT2JqZWN0LT5Db21tb24uVHlwZSkKQEAg LTE5NCw0NCArMTk2LDk3IEBACiAgICAgICAgIEFDUElfTUVNQ1BZIChOZXdPYmplY3QtPlN0cmlu Zy5Qb2ludGVyLAogICAgICAgICAgICAgUmV0dXJuT2JqZWN0LT5CdWZmZXIuUG9pbnRlciwgTGVu Z3RoKTsKIAotICAgICAgICAvKgotICAgICAgICAgKiBJZiB0aGUgb3JpZ2luYWwgb2JqZWN0IGlz IGEgcGFja2FnZSBlbGVtZW50LCB3ZSBuZWVkIHRvOgotICAgICAgICAgKiAxLiBTZXQgdGhlIHJl ZmVyZW5jZSBjb3VudCBvZiB0aGUgbmV3IG9iamVjdCB0byBtYXRjaCB0aGUKLSAgICAgICAgICog ICAgcmVmZXJlbmNlIGNvdW50IG9mIHRoZSBvbGQgb2JqZWN0LgotICAgICAgICAgKiAyLiBEZWNy ZW1lbnQgdGhlIHJlZmVyZW5jZSBjb3VudCBvZiB0aGUgb3JpZ2luYWwgb2JqZWN0LgotICAgICAg ICAgKi8KLSAgICAgICAgaWYgKFBhY2thZ2VJbmRleCAhPSBBQ1BJX05PVF9QQUNLQUdFX0VMRU1F TlQpCisgICAgICAgIGJyZWFrOworCisgICAgY2FzZSBBQ1BJX1RZUEVfUEFDS0FHRToKKworICAg ICAgICAvKiBEb2VzIHRoZSBtZXRob2Qvb2JqZWN0IGxlZ2FsbHkgcmV0dXJuIGEgYnVmZmVyPyAq LworCisgICAgICAgIGlmICghKEV4cGVjdGVkQnR5cGVzICYgQUNQSV9SVFlQRV9CVUZGRVIpKQog ICAgICAgICB7Ci0gICAgICAgICAgICBOZXdPYmplY3QtPkNvbW1vbi5SZWZlcmVuY2VDb3VudCA9 Ci0gICAgICAgICAgICAgICAgUmV0dXJuT2JqZWN0LT5Db21tb24uUmVmZXJlbmNlQ291bnQ7Cisg ICAgICAgICAgICByZXR1cm4gKEFFX0FNTF9PUEVSQU5EX1RZUEUpOworICAgICAgICB9CiAKLSAg ICAgICAgICAgIGlmIChSZXR1cm5PYmplY3QtPkNvbW1vbi5SZWZlcmVuY2VDb3VudCA+IDEpCi0g ICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAgUmV0dXJuT2JqZWN0LT5Db21tb24uUmVmZXJl bmNlQ291bnQtLTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgLyogRG9lcyB0aGUgb2JqZWN0IGFj dHVhbGx5IGNvbnRhaW4gaW50ZWdlcnM/ICovCiAKLSAgICAgICAgICAgIEFDUElfV0FSTl9QUkVE RUZJTkVEICgoQUVfSU5GTywgRGF0YS0+UGF0aG5hbWUsIERhdGEtPk5vZGVGbGFncywKLSAgICAg ICAgICAgICAgICAiQ29udmVydGVkIEJ1ZmZlciB0byBleHBlY3RlZCBTdHJpbmcgYXQgaW5kZXgg JXUiLAotICAgICAgICAgICAgICAgIFBhY2thZ2VJbmRleCkpOworICAgICAgICBpZiAoUmV0dXJu T2JqZWN0LT5QYWNrYWdlLkNvdW50ID09IDAgfHwKKyAgICAgICAgICAgIFJldHVybk9iamVjdC0+ UGFja2FnZS5FbGVtZW50c1swXS0+Q29tbW9uLlR5cGUgIT0gQUNQSV9UWVBFX0lOVEVHRVIpCisg ICAgICAgIHsKKyAgICAgICAgICAgIHJldHVybiAoQUVfQU1MX09QRVJBTkRfVFlQRSk7CiAgICAg ICAgIH0KLSAgICAgICAgZWxzZQorCisgICAgICAgIC8qCisgICAgICAgICAqIEhhdmUgYSBQYWNr YWdlLCBleHBlY3RlZCBhIEJ1ZmZlciwgY29udmVydC4gVGhlIGJlc3QgZXhhbXBsZSBvZgorICAg ICAgICAgKiB0aGlzIGlzIHRoZSBfRkRFIG1ldGhvZCwgd2hlcmUgdGhlIGJ1ZmZlciBvZiAzMi1i aXQgaW50ZWdlcnMKKyAgICAgICAgICogaXMgb2Z0ZW4gKGluY29ycmVjdGx5KSByZXR1cm5lZCBh cyBwYWNrYWdlIG9iamVjdCBvZiBpbnRlZ2Vycy4KKyAgICAgICAgICovCisgICAgICAgIExlbmd0 aCA9IFJldHVybk9iamVjdC0+UGFja2FnZS5Db3VudCAqIHNpemVvZiAoVUlOVDMyKTsKKworICAg ICAgICAvKiBBbGxvY2F0ZSBhIG5ldyBidWZmZXIgb2JqZWN0ICovCisKKyAgICAgICAgTmV3T2Jq ZWN0ID0gQWNwaVV0Q3JlYXRlQnVmZmVyT2JqZWN0IChMZW5ndGgpOworICAgICAgICBpZiAoIU5l d09iamVjdCkKICAgICAgICAgewotICAgICAgICAgICAgQUNQSV9XQVJOX1BSRURFRklORUQgKChB RV9JTkZPLCBEYXRhLT5QYXRobmFtZSwgRGF0YS0+Tm9kZUZsYWdzLAotICAgICAgICAgICAgICAg ICJDb252ZXJ0ZWQgQnVmZmVyIHRvIGV4cGVjdGVkIFN0cmluZyIpKTsKKyAgICAgICAgICAgIHJl dHVybiAoQUVfTk9fTUVNT1JZKTsKICAgICAgICAgfQogCi0gICAgICAgIC8qIERlbGV0ZSBvbGQg b2JqZWN0LCBpbnN0YWxsIHRoZSBuZXcgcmV0dXJuIG9iamVjdCAqLworICAgICAgICAvKgorICAg ICAgICAgKiBDb3B5IGVhY2ggcmF3IGVsZW1lbnQgdG8gYnVmZmVyIG9mIDMyLWJpdCBpbnRlZ2Vy cy4KKyAgICAgICAgICovCisgICAgICAgIENvdW50ID0gMDsKKyAgICAgICAgQnVmZmVyID0gTmV3 T2JqZWN0LT5CdWZmZXIuUG9pbnRlcjsKKyAgICAgICAgd2hpbGUgKENvdW50IDwgUmV0dXJuT2Jq ZWN0LT5QYWNrYWdlLkNvdW50KQorICAgICAgICB7CisgICAgICAgICAgICBWYWx1ZSA9IFJldHVy bk9iamVjdC0+UGFja2FnZS5FbGVtZW50c1tDb3VudF0tPkludGVnZXIuVmFsdWU7CisgICAgICAg ICAgICBBQ1BJX01FTUNQWSAoQnVmZmVyLCBBQ1BJX0NBU1RfUFRSIChVSU5UOCwgJlZhbHVlKSwK KyAgICAgICAgICAgICAgICBzaXplb2YgKFZhbHVlKSk7CisgICAgICAgICAgICBCdWZmZXIgKz0g c2l6ZW9mIChWYWx1ZSk7CisgICAgICAgICAgICBDb3VudCsrOworICAgICAgICB9CiAKLSAgICAg ICAgQWNwaVV0UmVtb3ZlUmVmZXJlbmNlIChSZXR1cm5PYmplY3QpOwotICAgICAgICAqUmV0dXJu T2JqZWN0UHRyID0gTmV3T2JqZWN0OwotICAgICAgICBEYXRhLT5GbGFncyB8PSBBQ1BJX09CSkVD VF9SRVBBSVJFRDsKLSAgICAgICAgcmV0dXJuIChBRV9PSyk7CisgICAgICAgIGJyZWFrOwogCiAg ICAgZGVmYXVsdDoKLSAgICAgICAgYnJlYWs7CisKKyAgICAgICAgcmV0dXJuIChBRV9BTUxfT1BF UkFORF9UWVBFKTsKICAgICB9CiAKLSAgICByZXR1cm4gKEFFX0FNTF9PUEVSQU5EX1RZUEUpOwor ICAgIC8qCisgICAgICogSWYgdGhlIG9yaWdpbmFsIG9iamVjdCBpcyBhIHBhY2thZ2UgZWxlbWVu dCwgd2UgbmVlZCB0bzoKKyAgICAgKiAxLiBTZXQgdGhlIHJlZmVyZW5jZSBjb3VudCBvZiB0aGUg bmV3IG9iamVjdCB0byBtYXRjaCB0aGUKKyAgICAgKiAgICByZWZlcmVuY2UgY291bnQgb2YgdGhl IG9sZCBvYmplY3QuCisgICAgICogMi4gRGVjcmVtZW50IHRoZSByZWZlcmVuY2UgY291bnQgb2Yg dGhlIG9yaWdpbmFsIG9iamVjdC4KKyAgICAgKi8KKyAgICBpZiAoUGFja2FnZUluZGV4ICE9IEFD UElfTk9UX1BBQ0tBR0VfRUxFTUVOVCkKKyAgICB7CisgICAgICAgIE5ld09iamVjdC0+Q29tbW9u LlJlZmVyZW5jZUNvdW50ID0KKyAgICAgICAgICAgIFJldHVybk9iamVjdC0+Q29tbW9uLlJlZmVy ZW5jZUNvdW50OworCisgICAgICAgIGlmIChSZXR1cm5PYmplY3QtPkNvbW1vbi5SZWZlcmVuY2VD b3VudCA+IDEpCisgICAgICAgIHsKKyAgICAgICAgICAgIFJldHVybk9iamVjdC0+Q29tbW9uLlJl ZmVyZW5jZUNvdW50LS07CisgICAgICAgIH0KKworICAgICAgICBBQ1BJX1dBUk5fUFJFREVGSU5F RCAoKEFFX0lORk8sIERhdGEtPlBhdGhuYW1lLCBEYXRhLT5Ob2RlRmxhZ3MsCisgICAgICAgICAg ICAiQ29udmVydGVkICVzIHRvIGV4cGVjdGVkICVzIGF0IGluZGV4ICV1IiwKKyAgICAgICAgICAg IEFjcGlVdEdldFR5cGVOYW1lIChSZXR1cm5PYmplY3QtPkNvbW1vbi5UeXBlKSwKKyAgICAgICAg ICAgIEFjcGlVdEdldFR5cGVOYW1lIChOZXdPYmplY3QtPkNvbW1vbi5UeXBlKSwgUGFja2FnZUlu ZGV4KSk7CisgICAgfQorICAgIGVsc2UKKyAgICB7CisgICAgICAgIEFDUElfV0FSTl9QUkVERUZJ TkVEICgoQUVfSU5GTywgRGF0YS0+UGF0aG5hbWUsIERhdGEtPk5vZGVGbGFncywKKyAgICAgICAg ICAgICJDb252ZXJ0ZWQgJXMgdG8gZXhwZWN0ZWQgJXMiLAorICAgICAgICAgICAgQWNwaVV0R2V0 VHlwZU5hbWUgKFJldHVybk9iamVjdC0+Q29tbW9uLlR5cGUpLAorICAgICAgICAgICAgQWNwaVV0 R2V0VHlwZU5hbWUgKE5ld09iamVjdC0+Q29tbW9uLlR5cGUpKSk7CisgICAgfQorCisgICAgLyog RGVsZXRlIG9sZCBvYmplY3QsIGluc3RhbGwgdGhlIG5ldyByZXR1cm4gb2JqZWN0ICovCisKKyAg ICBBY3BpVXRSZW1vdmVSZWZlcmVuY2UgKFJldHVybk9iamVjdCk7CisgICAgKlJldHVybk9iamVj dFB0ciA9IE5ld09iamVjdDsKKyAgICBEYXRhLT5GbGFncyB8PSBBQ1BJX09CSkVDVF9SRVBBSVJF RDsKKworICAgIHJldHVybiAoQUVfT0spOwogfQogCiAK --===============8900295346076012731==--