From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klausmann Subject: [RFC PATCH] nouveau/compiler: Allow to omit line numbers when printing instructions Date: Tue, 14 Nov 2017 16:01:05 +0100 Message-ID: <20171114150105.6428-1-tobias.johannes.klausmann@mni.thm.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: nouveau-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Nouveau" To: nouveau-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org List-Id: nouveau.vger.kernel.org VGhpcyBjb21lcyBpbiBoYW5keSB3aGVuIGNoZWNraW5nICJOVjUwX1BST0dfREVCVUc9MSIgb3V0 cHV0cyB3aXRoIGRpZmYhCgpTaWduZWQtb2ZmLWJ5OiBUb2JpYXMgS2xhdXNtYW5uIDx0b2JpYXMu am9oYW5uZXMua2xhdXNtYW5uQG1uaS50aG0uZGU+Ci0tLQogc3JjL2dhbGxpdW0vZHJpdmVycy9u b3V2ZWF1L2NvZGVnZW4vbnY1MF9pci5jcHAgICAgICAgIHwgIDYgKysrLS0tCiBzcmMvZ2FsbGl1 bS9kcml2ZXJzL25vdXZlYXUvY29kZWdlbi9udjUwX2lyLmggICAgICAgICAgfCAgMiArLQogc3Jj L2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pcl9kcml2ZXIuaCAgIHwgIDEg Kwogc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pcl9wcmludC5jcHAg IHwgMTIgKysrKysrKystLS0tCiBzcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvY29kZWdlbi9u djUwX2lyX3RhcmdldC5jcHAgfCAgMiArLQogc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L25v dXZlYXVfY29tcGlsZXIuYyAgICAgICAgIHwgIDggKysrKysrLS0KIHNyYy9nYWxsaXVtL2RyaXZl cnMvbm91dmVhdS9udjUwL252NTBfcHJvZ3JhbS5jICAgICAgICB8ICAxICsKIHNyYy9nYWxsaXVt L2RyaXZlcnMvbm91dmVhdS9udmMwL252YzBfcHJvZ3JhbS5jICAgICAgICB8ICAxICsKIDggZmls ZXMgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMTEgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pci5jcHAgYi9zcmMv Z2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvY29kZWdlbi9udjUwX2lyLmNwcAppbmRleCBlOTM2MzEw MWJmLi40YmY2YzczODM3IDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUv Y29kZWdlbi9udjUwX2lyLmNwcAorKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvY29k ZWdlbi9udjUwX2lyLmNwcApAQCAtMTI0OSw3ICsxMjQ5LDcgQEAgbnY1MF9pcl9nZW5lcmF0ZV9j b2RlKHN0cnVjdCBudjUwX2lyX3Byb2dfaW5mbyAqaW5mbykKICAgIGlmIChyZXQgPCAwKQogICAg ICAgZ290byBvdXQ7CiAgICBpZiAocHJvZy0+ZGJnRmxhZ3MgJiBOVjUwX0lSX0RFQlVHX1ZFUkJP U0UpCi0gICAgICBwcm9nLT5wcmludCgpOworICAgICAgcHJvZy0+cHJpbnQoaW5mby0+b21pdExp bmVOdW0pOwogCiAgICB0YXJnLT5wYXJzZURyaXZlckluZm8oaW5mbyk7CiAgICBwcm9nLT5nZXRU YXJnZXQoKS0+cnVuTGVnYWxpemVQYXNzKHByb2csIG52NTBfaXI6OkNHX1NUQUdFX1BSRV9TU0Ep OwpAQCAtMTI1NywxMyArMTI1NywxMyBAQCBudjUwX2lyX2dlbmVyYXRlX2NvZGUoc3RydWN0IG52 NTBfaXJfcHJvZ19pbmZvICppbmZvKQogICAgcHJvZy0+Y29udmVydFRvU1NBKCk7CiAKICAgIGlm IChwcm9nLT5kYmdGbGFncyAmIE5WNTBfSVJfREVCVUdfVkVSQk9TRSkKLSAgICAgIHByb2ctPnBy aW50KCk7CisgICAgICBwcm9nLT5wcmludChpbmZvLT5vbWl0TGluZU51bSk7CiAKICAgIHByb2ct Pm9wdGltaXplU1NBKGluZm8tPm9wdExldmVsKTsKICAgIHByb2ctPmdldFRhcmdldCgpLT5ydW5M ZWdhbGl6ZVBhc3MocHJvZywgbnY1MF9pcjo6Q0dfU1RBR0VfU1NBKTsKIAogICAgaWYgKHByb2ct PmRiZ0ZsYWdzICYgTlY1MF9JUl9ERUJVR19CQVNJQykKLSAgICAgIHByb2ctPnByaW50KCk7Cisg ICAgICBwcm9nLT5wcmludChpbmZvLT5vbWl0TGluZU51bSk7CiAKICAgIGlmICghcHJvZy0+cmVn aXN0ZXJBbGxvY2F0aW9uKCkpIHsKICAgICAgIHJldCA9IC00OwpkaWZmIC0tZ2l0IGEvc3JjL2dh bGxpdW0vZHJpdmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pci5oIGIvc3JjL2dhbGxpdW0vZHJp dmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pci5oCmluZGV4IGYyY2UxNmQ4ODIuLmEzYzdmZDJm OTQgMTAwNjQ0Ci0tLSBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9jb2RlZ2VuL252NTBf aXIuaAorKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvY29kZWdlbi9udjUwX2lyLmgK QEAgLTEyNDksNyArMTI0OSw3IEBAIHB1YmxpYzoKICAgIFByb2dyYW0oVHlwZSB0eXBlLCBUYXJn ZXQgKnRhcmcpOwogICAgflByb2dyYW0oKTsKIAotICAgdm9pZCBwcmludCgpOworICAgdm9pZCBw cmludChib29sIG9taXRMaW5lTnVtKTsKIAogICAgVHlwZSBnZXRUeXBlKCkgY29uc3QgeyByZXR1 cm4gcHJvZ1R5cGU7IH0KIApkaWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1 L2NvZGVnZW4vbnY1MF9pcl9kcml2ZXIuaCBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9j b2RlZ2VuL252NTBfaXJfZHJpdmVyLmgKaW5kZXggZmZkNTNjOWNkMy4uNjA0YTIyYmE4OSAxMDA2 NDQKLS0tIGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pcl9kcml2 ZXIuaAorKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvY29kZWdlbi9udjUwX2lyX2Ry aXZlci5oCkBAIC04Miw2ICs4Miw3IEBAIHN0cnVjdCBudjUwX2lyX3Byb2dfaW5mbwogCiAgICB1 aW50OF90IG9wdExldmVsOyAvKiBvcHRpbWl6YXRpb24gbGV2ZWwgKDAgdG8gMykgKi8KICAgIHVp bnQ4X3QgZGJnRmxhZ3M7CisgICBib29sIG9taXRMaW5lTnVtOwogCiAgICBzdHJ1Y3QgewogICAg ICAgaW50MTZfdCBtYXhHUFI7ICAgICAvKiBtYXkgYmUgLTEgaWYgbm9uZSB1c2VkICovCmRpZmYg LS1naXQgYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvY29kZWdlbi9udjUwX2lyX3ByaW50 LmNwcCBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9jb2RlZ2VuL252NTBfaXJfcHJpbnQu Y3BwCmluZGV4IGY1MjUzYjM3NDUuLmE0MmZiNDQ5NDAgMTAwNjQ0Ci0tLSBhL3NyYy9nYWxsaXVt L2RyaXZlcnMvbm91dmVhdS9jb2RlZ2VuL252NTBfaXJfcHJpbnQuY3BwCisrKyBiL3NyYy9nYWxs aXVtL2RyaXZlcnMvbm91dmVhdS9jb2RlZ2VuL252NTBfaXJfcHJpbnQuY3BwCkBAIC02ODksNyAr Njg5LDcgQEAgdm9pZCBJbnN0cnVjdGlvbjo6cHJpbnQoKSBjb25zdAogY2xhc3MgUHJpbnRQYXNz IDogcHVibGljIFBhc3MKIHsKIHB1YmxpYzoKLSAgIFByaW50UGFzcygpIDogc2VyaWFsKDApIHsg fQorICAgUHJpbnRQYXNzKGJvb2wgb21pdExpbmVOdW0gPSBmYWxzZSkgOiBzZXJpYWwoMCksIG9t aXRfc2VyaWFsKG9taXRMaW5lTnVtKSB7IH0KIAogICAgdmlydHVhbCBib29sIHZpc2l0KEZ1bmN0 aW9uICopOwogICAgdmlydHVhbCBib29sIHZpc2l0KEJhc2ljQmxvY2sgKik7CkBAIC02OTcsNiAr Njk3LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgaW50IHNlcmlhbDsKKyAgIGJvb2wgb21p dF9zZXJpYWw7CiB9OwogCiBib29sCkBAIC03NjAsNyArNzYxLDEwIEBAIFByaW50UGFzczo6dmlz aXQoQmFzaWNCbG9jayAqYmIpCiBib29sCiBQcmludFBhc3M6OnZpc2l0KEluc3RydWN0aW9uICpp bnNuKQogewotICAgSU5GTygiJTNpOiAiLCBzZXJpYWwrKyk7CisgICBpZiAob21pdF9zZXJpYWwp CisgICAgICBJTkZPKCIgICAiKTsKKyAgIGVsc2UKKyAgICAgIElORk8oIiUzaTogIiwgc2VyaWFs KyspOwogICAgaW5zbi0+cHJpbnQoKTsKICAgIHJldHVybiB0cnVlOwogfQpAQCAtNzczLDkgKzc3 Nyw5IEBAIEZ1bmN0aW9uOjpwcmludCgpCiB9CiAKIHZvaWQKLVByb2dyYW06OnByaW50KCkKK1By b2dyYW06OnByaW50KGJvb2wgb21pdExpbmVOdW0pCiB7Ci0gICBQcmludFBhc3MgcGFzczsKKyAg IFByaW50UGFzcyBwYXNzKG9taXRMaW5lTnVtKTsKICAgIGluaXRfY29sb3VycygpOwogICAgcGFz cy5ydW4odGhpcywgdHJ1ZSwgZmFsc2UpOwogfQpkaWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJp dmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pcl90YXJnZXQuY3BwIGIvc3JjL2dhbGxpdW0vZHJp dmVycy9ub3V2ZWF1L2NvZGVnZW4vbnY1MF9pcl90YXJnZXQuY3BwCmluZGV4IDI5OGU3YzZlZjku Ljk2YWQ3MGQyOGEgMTAwNjQ0Ci0tLSBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9jb2Rl Z2VuL252NTBfaXJfdGFyZ2V0LmNwcAorKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUv Y29kZWdlbi9udjUwX2lyX3RhcmdldC5jcHAKQEAgLTM3MSw3ICszNzEsNyBAQCBQcm9ncmFtOjpl bWl0QmluYXJ5KHN0cnVjdCBudjUwX2lyX3Byb2dfaW5mbyAqaW5mbykKICAgIGVtaXQtPnByZXBh cmVFbWlzc2lvbih0aGlzKTsKIAogICAgaWYgKGRiZ0ZsYWdzICYgTlY1MF9JUl9ERUJVR19CQVNJ QykKLSAgICAgIHRoaXMtPnByaW50KCk7CisgICAgICB0aGlzLT5wcmludChpbmZvLT5vbWl0TGlu ZU51bSk7CiAKICAgIGlmICghYmluU2l6ZSkgewogICAgICAgY29kZSA9IE5VTEw7CmRpZmYgLS1n aXQgYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbm91dmVhdV9jb21waWxlci5jIGIvc3Jj L2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L25vdXZlYXVfY29tcGlsZXIuYwppbmRleCAzMTUxYTZm NDIwLi5lZDY4MDMxMzgzIDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUv bm91dmVhdV9jb21waWxlci5jCisrKyBiL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9ub3V2 ZWF1X2NvbXBpbGVyLmMKQEAgLTEwMyw3ICsxMDMsNyBAQCBkdW1teV9hc3NpZ25fc2xvdHMoc3Ry dWN0IG52NTBfaXJfcHJvZ19pbmZvICppbmZvKQogCiBzdGF0aWMgaW50CiBub3V2ZWF1X2NvZGVn ZW4oaW50IGNoaXBzZXQsIGludCB0eXBlLCBzdHJ1Y3QgdGdzaV90b2tlbiB0b2tlbnNbXSwKLSAg ICAgICAgICAgICAgICB1bnNpZ25lZCAqc2l6ZSwgdW5zaWduZWQgKipjb2RlKSB7CisgICAgICAg ICAgICAgICAgdW5zaWduZWQgKnNpemUsIHVuc2lnbmVkICoqY29kZSwgYm9vbCBvbWl0TGluZU51 bSkgewogICAgc3RydWN0IG52NTBfaXJfcHJvZ19pbmZvIGluZm8gPSB7MH07CiAgICBpbnQgcmV0 OwogCkBAIC0xMjIsNiArMTIyLDcgQEAgbm91dmVhdV9jb2RlZ2VuKGludCBjaGlwc2V0LCBpbnQg dHlwZSwgc3RydWN0IHRnc2lfdG9rZW4gdG9rZW5zW10sCiAKICAgIGluZm8ub3B0TGV2ZWwgPSBk ZWJ1Z19nZXRfbnVtX29wdGlvbigiTlY1MF9QUk9HX09QVElNSVpFIiwgMyk7CiAgICBpbmZvLmRi Z0ZsYWdzID0gZGVidWdfZ2V0X251bV9vcHRpb24oIk5WNTBfUFJPR19ERUJVRyIsIDApOworICAg aW5mby5vbWl0TGluZU51bSA9IG9taXRMaW5lTnVtOwogCiAgICByZXQgPSBudjUwX2lyX2dlbmVy YXRlX2NvZGUoJmluZm8pOwogICAgaWYgKHJldCkgewpAQCAtMTQzLDEwICsxNDQsMTMgQEAgbWFp bihpbnQgYXJnYywgY2hhciAqYXJndltdKQogICAgRklMRSAqZjsKICAgIGNoYXIgdGV4dFs2NTUz Nl0gPSB7MH07CiAgICB1bnNpZ25lZCBzaXplID0gMCwgKmNvZGUgPSBOVUxMOworICAgYm9vbCBv bWl0TGluZU51bSA9IGZhbHNlOwogCiAgICBmb3IgKGkgPSAxOyBpIDwgYXJnYzsgaSsrKSB7CiAg ICAgICBpZiAoIXN0cmNtcChhcmd2W2ldLCAiLWEiKSkKICAgICAgICAgIGNoaXBzZXQgPSBzdHJ0 b2woYXJndlsrK2ldLCBOVUxMLCAxNik7CisgICAgICBpZiAoIXN0cmNtcChhcmd2W2ldLCAiLW8i KSkKKyAgICAgICAgIG9taXRMaW5lTnVtID0gc3RydG9sKGFyZ3ZbKytpXSwgTlVMTCwgMTApID8g dHJ1ZSA6IGZhbHNlOwogICAgICAgZWxzZQogICAgICAgICAgZmlsZW5hbWUgPSBhcmd2W2ldOwog ICAgfQpAQCAtMjAzLDcgKzIwNyw3IEBAIG1haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAg IH0KIAogICAgaWYgKGNoaXBzZXQgPj0gMHg1MCkgewotICAgICAgaSA9IG5vdXZlYXVfY29kZWdl bihjaGlwc2V0LCB0eXBlLCB0b2tlbnMsICZzaXplLCAmY29kZSk7CisgICAgICBpID0gbm91dmVh dV9jb2RlZ2VuKGNoaXBzZXQsIHR5cGUsIHRva2VucywgJnNpemUsICZjb2RlLCBvbWl0TGluZU51 bSk7CiAgICB9IGVsc2UgaWYgKGNoaXBzZXQgPj0gMHgzMCkgewogICAgICAgaSA9IG52MzBfY29k ZWdlbihjaGlwc2V0LCB0eXBlLCB0b2tlbnMsICZzaXplLCAmY29kZSk7CiAgICB9IGVsc2Ugewpk aWZmIC0tZ2l0IGEvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252NTAvbnY1MF9wcm9ncmFt LmMgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25vdXZlYXUvbnY1MC9udjUwX3Byb2dyYW0uYwppbmRl eCA2ZTk0M2EzZDk0Li5iN2I3NmViMGZjIDEwMDY0NAotLS0gYS9zcmMvZ2FsbGl1bS9kcml2ZXJz L25vdXZlYXUvbnY1MC9udjUwX3Byb2dyYW0uYworKysgYi9zcmMvZ2FsbGl1bS9kcml2ZXJzL25v dXZlYXUvbnY1MC9udjUwX3Byb2dyYW0uYwpAQCAtMzcwLDYgKzM3MCw3IEBAIG52NTBfcHJvZ3Jh bV90cmFuc2xhdGUoc3RydWN0IG52NTBfcHJvZ3JhbSAqcHJvZywgdWludDE2X3QgY2hpcHNldCwK ICNlbHNlCiAgICBpbmZvLT5vcHRMZXZlbCA9IDM7CiAjZW5kaWYKKyAgIGluZm8tPm9taXRMaW5l TnVtID0gZmFsc2U7CiAKICAgIHJldCA9IG52NTBfaXJfZ2VuZXJhdGVfY29kZShpbmZvKTsKICAg IGlmIChyZXQpIHsKZGlmZiAtLWdpdCBhL3NyYy9nYWxsaXVtL2RyaXZlcnMvbm91dmVhdS9udmMw L252YzBfcHJvZ3JhbS5jIGIvc3JjL2dhbGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9w cm9ncmFtLmMKaW5kZXggYzk1YTk2YzcxNy4uZDQ2MDYyMGI4MyAxMDA2NDQKLS0tIGEvc3JjL2dh bGxpdW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9wcm9ncmFtLmMKKysrIGIvc3JjL2dhbGxp dW0vZHJpdmVycy9ub3V2ZWF1L252YzAvbnZjMF9wcm9ncmFtLmMKQEAgLTU3OCw2ICs1NzgsNyBA QCBudmMwX3Byb2dyYW1fdHJhbnNsYXRlKHN0cnVjdCBudmMwX3Byb2dyYW0gKnByb2csIHVpbnQx Nl90IGNoaXBzZXQsCiAjZWxzZQogICAgaW5mby0+b3B0TGV2ZWwgPSAzOwogI2VuZGlmCisgICBp bmZvLT5vbWl0TGluZU51bSA9IGZhbHNlOwogCiAgICBpbmZvLT5iaW4uc21lbVNpemUgPSBwcm9n LT5jcC5zbWVtX3NpemU7CiAgICBpbmZvLT5pby5nZW5Vc2VyQ2xpcCA9IHByb2ctPnZwLm51bV91 Y3BzOwotLSAKMi4xNS4wCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fXwpOb3V2ZWF1IG1haWxpbmcgbGlzdApOb3V2ZWF1QGxpc3RzLmZyZWVkZXNrdG9wLm9y ZwpodHRwczovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL25vdXZlYXUK