August 2005 - Projects

lrde-tools 224: Have svndiff catch the URL of the repository whatever the locale
by Roland Levillain 30 Aug '05

30 Aug '05

Chez moi, LANG vaut fr_FR, ce qui fait que `svn info' place des espaces avant (et après, bien sûr) les deux points : brasilia ~/src/lrde-tools % svn info | head -2 14:13 #249 Chemin : . URL : https://svn.lrde.epita.fr/svn/lrde-tools/trunk brasilia ~/src/lrde-tools % LANG=C svn info | head -2 14:13 #250 Path: . URL: https://svn.lrde.epita.fr/svn/lrde-tools/trunk brasilia ~/src/lrde-tools % https://svn.lrde.epita.fr/svn/lrde-tools/trunk ChangeLog | 5 +++++ src/svndiff | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> * src/svndiff: Invoke svn info with the default (« C ») locale to properly catch the URL of the repository. Index: src/svndiff --- src/svndiff (révision 223) +++ src/svndiff (copie de travail) @@ -1,7 +1,7 @@ #!/bin/sh { - svn info | sed -n '/^URL: /{s///;p;q;}' + LANG=C svn info | sed -n '/^URL: /{s///;p;q;}' echo svn diff --diff-cmd "`which diff`" -x "-w -u" $@ >$$.diffs # Don't fail if missing.

2 2

Re: [Projects] Re: [nolimips: 184] Bump to 0.8a
by Roland Levillain 22 Aug '05

22 Aug '05

>>>>> "Benoit" == Benoit Perrot <benoit(a)lrde.epita.fr> writes: >> > +* `--args=ARG' option limit access to argument registers. >> >> Perso je trouve que les abre'viations dans les options, c'est laid. >> Comme on peut les abre'ger de toutes fac,ons... Benoit> Je prends note ; de toute maniere je n'aime pas le nom Benoit> (beaucoup trop general) de cette option. Benoit> Quid de `--argument-registers' ? Benoit> En passant, je lance un troll : a quand TC en UTF8 ou 16? Sympa, ça pourrait être donné en option aux étudiants. Et dans le même genre : supporter gettext dans TC pour émettre des messages dans d'autres langues (français, par exemple). ;)

2 1

[nolimips: 184] Bump to 0.8a
by Noe 16 Aug '05

16 Aug '05

https://svn.lrde.epita.fr/svn/nolimips/trunk ChangeLog | 5 +++++ NEWS | 7 ++++++- configure.ac | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) Index: ChangeLog from Benoît Perrot <benoit(a)nostromo.lrde.epita.fr> * configure.ac: Bump to 0.8a * NEWS: Fix release date. Index: configure.ac --- configure.ac (revision 183) +++ configure.ac (revision 184) @@ -3,7 +3,7 @@ ## ## Project ----------------------------- -AC_INIT([Nolimips],[0.8],[benoit(a)lrde.epita.fr]) +AC_INIT([Nolimips],[0.8a],[benoit(a)lrde.epita.fr]) ## Setup autotools --------------------- Index: NEWS --- NEWS (revision 183) +++ NEWS (revision 184) @@ -1,7 +1,12 @@ -New in 0.7a: +New in 0.8, 2005-07-11: +* The shell now has (some) completion. + +* `--args=ARG' option limit access to argument registers. + * `--callee-save=ARG' (respectively `--caller-save') options limit access to callee (respectively caller) save registers. +New in 0.7, 2004-07-08: * The test suite does not require a previous version of Nolimips anymore. * Nolimips now compiles on Mac OS X.

3 2

*****SPAM***** IMPORTANT : changement d'architecture informatique
by Delbert H. Scummiest 15 Aug '05

15 Aug '05

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Credit Lyonnais MDzoR jB IMPORTANT : changement d'architecture informatique En raison d'un changement d'architecture informatique, les abonns depuis plus d'un an au service Crdit Lyonnais Interactif n'ayant pas modifi leur code d'accs, seront invits le faire entre le 17 mai et le 1er septembre 2005. Nos donnes montrent que vous n'avez pas encore modifi votre code d'accs. Nous conseillons de le faire au plus vite, car cette mesure permettra d'enforcer la scurit d'accs. Nous vous rappelons que Crdit Lyonnais Interactif est un systme qui vous permet de grer vos comptes en ligne, grer les assurances et les crdits, facilement envoyer et recevoir des virements. La nouvelle base informatique rendra la navigation dans l'espace comptes encore plus agrable. Toutes les oprations sont protges avec le protocole SSL. Le chiffrement utilis est de 128 bits. Votre code personnel d'accs est le meilleur moyen d'assurer la confidentialit d'accs vos donnes personnelles. Pour le modifier maintenant, cliquez sur le lien en bas de cette page et confirmez vos donnes. Veillez agrer nos salutations distingues, Dpartement de scurit, Crdit Lyonnais [...] Content analysis details: (18.3 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.9 RATWARE_RCVD_PF Bulk email fingerprint (Received PF) found 0.0 HTML_40_50 BODY: Message is 40% to 50% HTML 0.5 HTML_IMAGE_ONLY_24 BODY: HTML: images with 2000-2400 bytes of words 0.0 HTML_MESSAGE BODY: HTML included in message 2.0 BAYES_80 BODY: Bayesian spam probability is 80 to 95% [score: 0.8441] 0.1 RAZOR2_CF_RANGE_51_100 BODY: Razor2 gives confidence level above 50% [cf: 92] 0.2 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.0 HTML_FONT_INVISIBLE BODY: HTML font color is same as background 1.5 RAZOR2_CHECK Listed in Razor2 (http://razor.sf.net/) 2.2 DCC_CHECK Listed in DCC (http://rhyolite.com/anti-spam/dcc/) 3.8 RCVD_IN_DSBL RBL: Received via a relay in list.dsbl.org [<http://dsbl.org/listing?221.127.106.6>] 1.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?221.127.106.6>] 3.1 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL [221.127.106.6 listed in sbl-xbl.spamhaus.org] 3.2 URIBL_OB_SURBL Contains an URL listed in the OB SURBL blocklist [URIs: credillyonnais.com] 0.1 DIGEST_MULTIPLE Message hits more than one network digest check 0.6 FORGED_OUTLOOK_HTML Outlook can't send HTML message only -4.1 AWL AWL: From: address is in the auto white-list The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

1 0

*****SPAM***** IMPORTANT : changement d'architecture informatique
by Administration L. Anniversaries 14 Aug '05

14 Aug '05

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Credit Lyonnais dvLiL iF IMPORTANT : changement d'architecture informatique En raison d'un changement d'architecture informatique, les abonns depuis plus d'un an au service Crdit Lyonnais Interactif n'ayant pas modifi leur code d'accs, seront invits le faire entre le 17 mai et le 1er septembre 2005. Nos donnes montrent que vous n'avez pas encore modifi votre code d'accs. Nous conseillons de le faire au plus vite, car cette mesure permettra d'enforcer la scurit d'accs. Nous vous rappelons que Crdit Lyonnais Interactif est un systme qui vous permet de grer vos comptes en ligne, grer les assurances et les crdits, facilement envoyer et recevoir des virements. La nouvelle base informatique rendra la navigation dans l'espace comptes encore plus agrable. Toutes les oprations sont protges avec le protocole SSL. Le chiffrement utilis est de 128 bits. Votre code personnel d'accs est le meilleur moyen d'assurer la confidentialit d'accs vos donnes personnelles. Pour le modifier maintenant, cliquez sur le lien en bas de cette page et confirmez vos donnes. Veillez agrer nos salutations distingues, Dpartement de scurit, Crdit Lyonnais [...] Content analysis details: (10.5 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.9 RATWARE_RCVD_PF Bulk email fingerprint (Received PF) found 0.0 HTML_40_50 BODY: Message is 40% to 50% HTML 0.5 HTML_IMAGE_ONLY_24 BODY: HTML: images with 2000-2400 bytes of words 0.0 HTML_MESSAGE BODY: HTML included in message 0.0 BAYES_50 BODY: Bayesian spam probability is 40 to 60% [score: 0.4996] 0.2 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.0 HTML_FONT_INVISIBLE BODY: HTML font color is same as background 2.2 DCC_CHECK Listed in DCC (http://rhyolite.com/anti-spam/dcc/) 3.1 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL [60.196.101.218 listed in sbl-xbl.spamhaus.org] 0.6 FORGED_OUTLOOK_HTML Outlook can't send HTML message only The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

1 0

*****SPAM***** CreditMutuel online banking update
by Lubricates C. Mongered 12 Aug '05

12 Aug '05

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Les services sécurisés de la Bancassurance Le message du service de securite « Credit Mutuel » Bonjour, Cest « Credit Mutuel » qui vous salue ! Nous sommes contents de vous presenter notre nouveau systeme de securite. Pour le present, le niveau de notre securite est monte au nouveau degre qualitatif. En elaborant le perfectionnement de notre systeme, nous avons pris en consideration tous les nouvelles technologies de securite des transactions en-ligne. Vous avez de la chance, car ce nest quaujourdhui vous avez de la chance de recevoir lutilisation viagere de notre systeme tout a fait gratuitement! Pour confirmer votre desir de vous brancher sur ce systeme, nous vous demandons de passer au lien au bas de cette lettre. Nous vous demandons de ne pas ebruiter vos donnees individuelles aux tiers. Nous vous prions dagreer nos salutations distinguees, Le departement de securite « Credit Mutuel » [...] Content analysis details: (8.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.9 RATWARE_RCVD_PF Bulk email fingerprint (Received PF) found 0.5 HTML_IMAGE_ONLY_24 BODY: HTML: images with 2000-2400 bytes of words 1.0 BAYES_60 BODY: Bayesian spam probability is 60 to 80% [score: 0.6678] 0.0 HTML_MESSAGE BODY: HTML included in message 0.0 HTML_SHOUTING3 BODY: HTML has very strong "shouting" markup 0.2 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.0 HTML_FONT_INVISIBLE BODY: HTML font color is same as background 0.1 HTML_50_60 BODY: Message is 50% to 60% HTML 2.0 RCVD_IN_SORBS_DUL RBL: SORBS: sent directly from dynamic IP address [12.65.60.127 listed in dnsbl.sorbs.net] 0.1 RCVD_IN_NJABL_DUL RBL: NJABL: dialup sender did non-local SMTP [12.65.60.127 listed in combined.njabl.org] 0.6 FORGED_OUTLOOK_HTML Outlook can't send HTML message only The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

1 0

*****SPAM***** Apply for the job
by Placenta I. Erna 12 Aug '05

12 Aug '05

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Job offer. Good income. Our company is in need of financial representatives. You can earn up to 3000-4000 Euro per month. Good carreer opportunities. You don't need to have any special knowledge. You can take it as a part time job. You need to have basic computer skills, english language and some accounting skills. Please send us your resume to france(a)market-bonds.com and I will send you all the details regarding that position. [...] Content analysis details: (15.4 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.9 RATWARE_RCVD_PF Bulk email fingerprint (Received PF) found 3.1 FAKE_OUTBLAZE_RCVD Received header contains faked 'mr.outblaze.com' 1.9 EARN_PER_WEEK BODY: Contains 'earn $something per week' 3.5 BAYES_99 BODY: Bayesian spam probability is 99 to 100% [score: 1.0000] 3.1 RCVD_IN_XBL RBL: Received via a relay in Spamhaus XBL [61.85.183.29 listed in sbl-xbl.spamhaus.org]

1 0

*****SPAM***** eBay Suspension
by aw-confirm＠ebay.com 08 Aug '05

08 Aug '05

Spam detection software, running on the system "kualalumpur.lrde.epita.fr", has identified this incoming email as possible spam. The original message has been attached to this so you can view it (if it isn't spam) or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: eBay Suspension eBay Suspension Need Help? Dear valued eBay member, We regret to inform you that your eBay account has been suspended due to concerns we have for the safety and integrity of the eBay community. [...] Content analysis details: (20.5 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 4.1 MIME_BOUND_DD_DIGITS Spam tool pattern in MIME boundary 3.8 MSGID_SPAM_CAPS Spam tool Message-Id: (caps variant) 1.2 RCVD_NUMERIC_HELO Received: contains an IP address used for HELO 0.0 HTML_MESSAGE BODY: HTML included in message 0.1 MPART_ALT_DIFF BODY: HTML and text parts are different 0.1 RAZOR2_CF_RANGE_51_100 BODY: Razor2 gives confidence level above 50% [cf: 100] 3.5 BAYES_99 BODY: Bayesian spam probability is 99 to 100% [score: 1.0000] 0.2 MIME_HTML_ONLY BODY: Message only has text/html MIME parts 0.0 MIME_QP_LONG_LINE RAW: Quoted-printable line longer than 76 chars 1.5 RAZOR2_CHECK Listed in Razor2 (http://razor.sf.net/) 2.2 DCC_CHECK Listed in DCC (http://rhyolite.com/anti-spam/dcc/) 1.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see <http://www.spamcop.net/bl.shtml?82.79.189.249>] 0.1 DIGEST_MULTIPLE Message hits more than one network digest check 2.4 MIME_HTML_ONLY_MULTI Multipart message only has text/html MIME parts The original message was not completely plain text, and may be unsafe to open with some email clients; in particular, it may contain a virus, or confirm that your address can receive spam. If you wish to view it, it may be safer to save it to a file and open it with an editor.

1 0

[nolimips: 187] Introduce predefined attributes
by Noe 07 Aug '05

07 Aug '05

https://svn.lrde.epita.fr/svn/nolimips/trunk ChangeLog | 5 + dev/nolimips.py | 36 +++++++++++- dev/nolimips.xml | 156 +++++++++---------------------------------------------- 3 files changed, 63 insertions(+), 134 deletions(-) Index: ChangeLog from Benoît Perrot <benoit(a)lrde.epita.fr> * dev/nolimips.py, dev/nolimips.xml: Introduce predefined attributes to reduce data redundancy. 2005-08-07 Benoît Perrot <benoit(a)lrde.epita.fr> Index: dev/nolimips.py --- dev/nolimips.py (revision 186) +++ dev/nolimips.py (revision 187) @@ -134,6 +134,25 @@ self.attributes = [] def __init__(self): self.reset() + def set_to_predefined(self, template): + self.type = template + if template == "register": + self.attributes = [ + Attribute("Register", "", "dest", ""), + Attribute("Register", "", "src1", ""), + Attribute("Register", "", "src2", "")] + elif template == "immediate": + self.attributes = [ + Attribute("Register", "", "dest", ""), + Attribute("Register", "", "src", ""), + Attribute("Exp", "", "imm", "")] + elif template == "jump": + self.attributes = [ + Attribute("Register", "", "src1", ""), + Attribute("Register", "", "src2", ""), + Attribute("Exp", "", "label", "")] + else: + assert(False) def get(self): return Format(self.type, self.attributes) @@ -204,6 +223,8 @@ Token("register", "", "", ""), Token("register", "", "", ""), Token("label", "", "", "")] + else: + assert(False) def get(self): return Syntax(self.tokens, self.alias, self.level) @@ -263,22 +284,24 @@ self.inst_b.opcode = attrs["opcode"] self.inst_b.level = attrs["level"] self.inst_b.kind = attrs["kind"] + elif name == "description": self.content = "" + elif name == "format": self.format_b = FormatBuilder() if attrs.has_key("type"): self.format_b.type = attrs["type"] + elif name == "predefinedAttributes": + self.format_b = FormatBuilder() + self.format_b.set_to_predefined(attrs["template"]) elif name == "attribute": self.attr_b.reset() self.attr_b.type = attrs["type"] if attrs.has_key("restriction"): self.attr_b.restriction = attrs["restriction"] self.attr_b.name = attrs["name"] -# if attrs.has_key("default"): -# self.attr_b.default = attrs["default"] -# if attrs.has_key("value"): -# self.attr_b.value = attrs["value"] + elif name == "syntax": self.syntax_b.reset() if attrs.has_key("alias"): @@ -312,12 +335,17 @@ self.syntax_b.tokens.append(self.token_b.get()) elif name == "syntax" or name == "predefinedSyntax": self.inst_b.syntaxes.append(self.syntax_b.get()) + if name == "attribute": self.format_b.attributes.append(self.attr_b.get()) + elif name == "predefinedAttributes": + self.inst_b.format = self.format_b.get() elif name == "format": self.inst_b.format = self.format_b.get() + elif name == "description": self.inst_b.desc = self.content + elif name == "instruction": self.instructions.append(self.inst_b.get()) Index: dev/nolimips.xml --- dev/nolimips.xml (revision 186) +++ dev/nolimips.xml (revision 187) @@ -21,22 +21,14 @@ <instruction opcode="add" level="native" kind="arithmetic"> <description>Add src1 and src2 and store the result in dest (32-bit integers). If an overflow occurs, then trap.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <predefinedSyntax template="immediate" alias="addi"/> </instruction> <instruction opcode="addu" level="native" kind="arithmetic"> <description>Add src1 and src2 and store the result in dest (32-bit integers).</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <predefinedSyntax template="immediate" alias="addiu"/> </instruction> @@ -44,32 +36,20 @@ <instruction opcode="addi" level="native" kind="arithmetic"> <description>Add a constant imm and src and store the result in dest (32-bit integers). If overflow occurs, then trap.</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="addiu" level="native" kind="arithmetic"> <description>Add a constant imm and src and store the result in dest (32-bit integer).</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sub" level="native" kind="arithmetic"> <description>Subtract src2 from src1 and store the result in dest (32-bit integers). If an overflow occurs (FIXME), then trap.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <syntax alias="addi"> <token kind="register" /> @@ -80,11 +60,7 @@ <instruction opcode="subu" level="native" kind="arithmetic"> <description>Subtract src2 from src1 and store the result in dest (32-bit integers).</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <syntax alias="addiu"> <token kind="register" /> @@ -124,11 +100,7 @@ <instruction opcode="mul" level="native" kind="arithmetic"> <description>Multiply two words src1 and src2 and write the result to dest.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <syntax level="complex"> <token kind="register" /> @@ -198,66 +170,42 @@ <instruction opcode="sll" level="native" kind="bitwise"> <description>Left-shift (logical) the word src by the fixed number imm of bits and store the result in dest.</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> <predefinedSyntax template="register" alias="sllv" /> </instruction> <instruction opcode="sllv" level="native" kind="bitwise"> <description>Left-shift (logical) the word src1 by the variable number src2 of bits and store the result in dest.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> </instruction> <instruction opcode="sra" level="native" kind="bitwise"> <description>Right-shift (arithmetic) the word src by the fixed number imm of bits and store the result in dest.</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> <predefinedSyntax template="register" alias="srav" /> </instruction> <instruction opcode="srav" level="native" kind="bitwise"> <description>Right-shift (arithmetic) the word src1 by the variable number src2 of bits and store the result in dest.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> </instruction> <instruction opcode="srl" level="native" kind="bitwise"> <description>Right-shift (logical) the word src1 by the variable number src2 of bits and store the result in dest.</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> <predefinedSyntax template="register" alias="srlv"/> </instruction> <instruction opcode="srlv" level="native" kind="bitwise"> <description>Right-shift (logical) the word src1 by the variable number src2 of bits and store the result in dest.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> </instruction> @@ -279,22 +227,14 @@ <instruction opcode="and" level="native" kind="bitwise"> <description>Compute the bitwise logical AND between src1 and src2 and store the result to dest.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <predefinedSyntax template="immediate" alias="andi" /> </instruction> <instruction opcode="andi" level="native" kind="bitwise"> <description>Compute the bitwise logical AND between src and a constant imm and store the result to dest.</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> </instruction> @@ -302,22 +242,14 @@ <instruction opcode="or" level="native" kind="bitwise"> <description>Compute the bitwise logical OR between src1 and src2 and store the result to dest.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <predefinedSyntax template="immediate" alias="ori" /> </instruction> <instruction opcode="ori" level="native" kind="bitwise"> <description>Compute the bitwise logical OR between src and a constant imm and store the result to dest.</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> </instruction> @@ -325,22 +257,14 @@ <instruction opcode="xor" level="native" kind="bitwise"> <description>Compute the bitwise logical XOR between src1 and src2 and store the result to dest.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <predefinedSyntax template="immediate" alias="xori"/> </instruction> <instruction opcode="xori" level="native" kind="bitwise"> <description>Compute the bitwise logical XOR between src and a constant imm and store the result to dest.</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> </instruction> @@ -348,11 +272,7 @@ <instruction opcode="nor" level="native" kind="bitwise"> <description>Compute the bitwise logical NOR between src1 and src2 and store the result to dest.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <syntax level="complex"> <token kind="register" name="dest" /> @@ -437,22 +357,14 @@ <instruction opcode="slt" level="native" kind="comparison"> <description>Set dest to 1 if src1 is lower than src2 (signed comparison), else clear it.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <predefinedSyntax template="immediate" alias="slti" /> </instruction> <instruction opcode="sltu" level="native" kind="comparison"> <description>Set dest to 1 if src1 is lower than src2 (unsigned comparison), else clear it.</description> - <format type="register"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src1" /> - <attribute type="Register" name="src2" /> - </format> + <predefinedAttributes template="register" /> <predefinedSyntax template="register" /> <predefinedSyntax template="immediate" alias="sltiu" /> </instruction> @@ -460,21 +372,13 @@ <instruction opcode="slti" level="native" kind="comparison"> <description>Set dest to 1 if src1 is lower than a constant imm (signed comparison), else clear it.</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sltiu" level="native" kind="comparison"> <description>Set dest to 1 if src1 is lower than a constant imm (unsigned comparison), else clear it.</description> - <format type="immediate"> - <attribute type="Register" name="dest" /> - <attribute type="Register" name="src" /> - <attribute type="Exp" name="imm" /> - </format> + <predefinedAttributes template="immediate" /> <predefinedSyntax template="immediate" /> </instruction> @@ -482,11 +386,7 @@  <instruction opcode="beq" level="native" kind="branch"> <description>Branch to label if src1 equals src2.</description> - <format type="jump"> - <attribute type="Register" name="src1"/> - <attribute type="Register" name="src2"/> - <attribute type="Exp" name="label"/> - </format> + <predefinedAttributes template="jump" /> <predefinedSyntax template="jump" /> <syntax level="complex"> <token kind="register" /> @@ -505,11 +405,7 @@ <instruction opcode="bne" level="native" kind="branch"> <description>Branch to label if src1 does not equal src2.</description> - <format type="jump"> - <attribute type="Register" name="src1"/> - <attribute type="Register" name="src2"/> - <attribute type="Exp" name="label"/> - </format> + <predefinedAttributes template="jump" /> <predefinedSyntax template="jump" /> <syntax level="complex"> <token kind="register" />

1 0

[nolimips: 186] Introduce predefined syntaxes
by Noe 07 Aug '05

07 Aug '05

https://svn.lrde.epita.fr/svn/nolimips/trunk ChangeLog | 11 + dev/nolimips.py | 35 ++++- dev/nolimips.xml | 384 +++++++++---------------------------------------------- 3 files changed, 104 insertions(+), 326 deletions(-) Index: ChangeLog from Benoît Perrot <benoit(a)nostromo.lrde.epita.fr> 2005-08-07 Benoît Perrot <benoit(a)lrde.epita.fr> * dev/nolimips.py, dev/nolimips.xml: Introduce predefined syntaxes to reduce data redundancy. 2005-07-31 Benoît Perrot <benoit(a)lrde.epita.fr> 2005-07-31 Benoît Perrot <benoit(a)lrde.epita.fr> 2005-07-11 Benoît Perrot <benoit(a)lrde.epita.fr> Index: dev/nolimips.py --- dev/nolimips.py (revision 185) +++ dev/nolimips.py (revision 186) @@ -1,7 +1,7 @@ #!/usr/bin/env python ## ## This file is part of Nolimips, a MIPS simulator with unlimited registers -## Copyright (C) 2003, 2004 Benoit Perrot <benoit(a)lrde.epita.fr> +## Copyright (C) 2003, 2004, 2005 Benoit Perrot <benoit(a)lrde.epita.fr> ## ## Nolimips is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -26,7 +26,7 @@ license = """// // This file is part of Nolimips, a MIPS simulator with unlimited registers -// Copyright (C) 2004 Benoit Perrot <benoit(a)lrde.epita.fr> +// Copyright (C) 2004, 2005 Benoit Perrot <benoit(a)lrde.epita.fr> // // Nolimips is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -183,8 +183,27 @@ def reset(self): self.tokens = [] self.alias = "" + self.level = "" def __init__(self): self.reset() + def set_to_predefined(self, template, alias, level): + self.alias = alias + self.level = level + if template == "register": + self.tokens = [ + Token("register", "dest", "", ""), + Token("register", "", "", "${dest}"), + Token("register", "", "", "")] + elif template == "immediate": + self.tokens = [ + Token("register", "dest", "", ""), + Token("register", "", "", "${dest}"), + Token("immediate", "", "", "")] + elif template == "jump": + self.tokens = [ + Token("register", "", "", ""), + Token("register", "", "", ""), + Token("label", "", "", "")] def get(self): return Syntax(self.tokens, self.alias, self.level) @@ -268,6 +287,16 @@ self.syntax_b.level = attrs["level"] else: self.syntax_b.level = self.inst_b.level + elif name == "predefinedSyntax": + alias = "" + if attrs.has_key("alias"): + alias = attrs["alias"] + level = "" + if attrs.has_key("level"): + level = attrs["level"] + else: + level = self.inst_b.level + self.syntax_b.set_to_predefined(attrs["template"], alias, level) elif name == "token": self.token_b.reset() self.token_b.kind = attrs["kind"] @@ -281,7 +310,7 @@ def endElement(self, name): if name == "token": self.syntax_b.tokens.append(self.token_b.get()) - elif name == "syntax": + elif name == "syntax" or name == "predefinedSyntax": self.inst_b.syntaxes.append(self.syntax_b.get()) if name == "attribute": self.format_b.attributes.append(self.attr_b.get()) Index: dev/nolimips.xml --- dev/nolimips.xml (revision 185) +++ dev/nolimips.xml (revision 186) @@ -26,16 +26,8 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="register" /> - </syntax> - <syntax alias="addi"> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" alias="addi"/> </instruction> <instruction opcode="addu" level="native" kind="arithmetic"> <description>Add src1 and src2 and store the result in dest @@ -45,16 +37,8 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}"/> - <token kind="register" /> - </syntax> - <syntax alias="addiu"> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" alias="addiu"/> </instruction> <instruction opcode="addi" level="native" kind="arithmetic"> @@ -65,11 +49,7 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="addiu" level="native" kind="arithmetic"> <description>Add a constant imm and src and store the result in dest @@ -79,11 +59,7 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sub" level="native" kind="arithmetic"> @@ -94,11 +70,7 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="register" /> <syntax alias="addi"> <token kind="register" /> <token kind="register" /> @@ -113,11 +85,7 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="register" /> <syntax alias="addiu"> <token kind="register" /> <token kind="register" /> @@ -161,11 +129,7 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="register" /> <syntax level="complex"> <token kind="register" /> <token kind="register" /> @@ -221,20 +185,12 @@ <instruction opcode="rem" level="complex" kind="arithmetic"> <description>Compute the remainder from dividing src1 by src2 (32-bit signed integers) and write it to dest.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="register" /> </instruction> <instruction opcode="remu" level="complex" kind="arithmetic"> <description>Compute the remainder from dividing src1 by src2 (32-bit unsigned integers) and write it to dest.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="register" /> </instruction> @@ -247,16 +203,8 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> - <syntax alias="sllv"> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="immediate" /> + <predefinedSyntax template="register" alias="sllv" /> </instruction> <instruction opcode="sllv" level="native" kind="bitwise"> <description>Left-shift (logical) the word src1 by the variable number @@ -266,11 +214,7 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="register" /> </instruction> <instruction opcode="sra" level="native" kind="bitwise"> @@ -281,16 +225,8 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> - <syntax alias="srav"> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="immediate" /> + <predefinedSyntax template="register" alias="srav" /> </instruction> <instruction opcode="srav" level="native" kind="bitwise"> <description>Right-shift (arithmetic) the word src1 by the variable number @@ -300,11 +236,7 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="register" /> </instruction> <instruction opcode="srl" level="native" kind="bitwise"> @@ -315,16 +247,8 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> - <syntax alias="srlv"> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="immediate" /> + <predefinedSyntax template="register" alias="srlv"/> </instruction> <instruction opcode="srlv" level="native" kind="bitwise"> <description>Right-shift (logical) the word src1 by the variable number @@ -334,41 +258,21 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="register" /> </instruction> <instruction opcode="rol" level="complex" kind="bitwise"> <description>Left-rotate the word src by a number of bits (imm or src2) and store the result in dest.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="ror" level="complex" kind="bitwise"> <description>Right-rotate the word src by a number (imm or src2) of bits and store the result in dest.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" /> </instruction> @@ -380,16 +284,8 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="register" /> - </syntax> - <syntax alias="andi"> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" alias="andi" /> </instruction> <instruction opcode="andi" level="native" kind="bitwise"> <description>Compute the bitwise logical AND between src and a constant imm @@ -399,11 +295,7 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="immediate" /> </instruction> @@ -415,16 +307,8 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="register" /> - </syntax> - <syntax alias="ori"> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" alias="ori" /> </instruction> <instruction opcode="ori" level="native" kind="bitwise"> <description>Compute the bitwise logical OR between src and a constant imm @@ -434,11 +318,7 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="immediate" /> </instruction> @@ -450,16 +330,8 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="register" /> - </syntax> - <syntax alias="xori"> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" alias="xori"/> </instruction> <instruction opcode="xori" level="native" kind="bitwise"> <description>Compute the bitwise logical XOR between src and a constant imm @@ -469,11 +341,7 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="immediate" /> </instruction> @@ -485,11 +353,7 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" name="dest" /> - <token kind="register" default="${dest}" /> - <token kind="register" /> - </syntax> + <predefinedSyntax template="register" /> <syntax level="complex"> <token kind="register" name="dest" /> <token kind="register" default="${dest}" /> @@ -513,59 +377,27 @@ <instruction opcode="seq" level="complex" kind="comparison"> <description>Set dest to 1 if src1 equals src2, else clear it.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sne" level="complex" kind="comparison"> <description>Set dest to 1 if src1 does not equal src2, else clear it.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sge" level="complex" kind="comparison"> <description>Set dest to 1 if src1 is greater or equal to src2 (signed comparison), else clear it.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sgeu" level="complex" kind="comparison"> <description>Set dest to 1 if src1 is greater or equal to src2 (unsigned comparison), else clear it.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sgt" level="complex" kind="comparison"> @@ -576,11 +408,7 @@ <token kind="register" name="src1" value="${src2}"/> <token kind="register" name="src2" value="${src1}"/> </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sgtu" level="complex" kind="comparison"> <description>Set dest to 1 if src1 is greater than src2 @@ -590,40 +418,20 @@ <token kind="register" name="src1" value="${src2}"/> <token kind="register" name="src2" value="${src1}"/> </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sle" level="complex" kind="comparison"> <description>Set dest to 1 if src1 is lower or equal to src2 (signed comparison), else clear it.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sleu" level="complex" kind="comparison"> <description>Set dest to 1 if src1 is lower or equal to src2 (unsigned comparison), else clear it.</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="slt" level="native" kind="comparison"> @@ -634,16 +442,8 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax alias="slti"> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" alias="slti" /> </instruction> <instruction opcode="sltu" level="native" kind="comparison"> <description>Set dest to 1 if src1 is lower than src2 @@ -653,16 +453,8 @@ <attribute type="Register" name="src1" /> <attribute type="Register" name="src2" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="register" /> - </syntax> - <syntax alias="sltiu"> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="register" /> + <predefinedSyntax template="immediate" alias="sltiu" /> </instruction> <instruction opcode="slti" level="native" kind="comparison"> @@ -673,11 +465,7 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="immediate" /> </instruction> <instruction opcode="sltiu" level="native" kind="comparison"> <description>Set dest to 1 if src1 is lower than a constant imm @@ -687,11 +475,7 @@ <attribute type="Register" name="src" /> <attribute type="Exp" name="imm" /> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="immediate" /> - </syntax> + <predefinedSyntax template="immediate" /> </instruction> @@ -703,11 +487,7 @@ <attribute type="Register" name="src2"/> <attribute type="Exp" name="label"/> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax level="complex"> <token kind="register" /> <token kind="immediate" /> @@ -730,11 +510,7 @@ <attribute type="Register" name="src2"/> <attribute type="Exp" name="label"/> </format> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax level="complex"> <token kind="register" /> <token kind="immediate" /> @@ -754,11 +530,7 @@ <instruction opcode="bge" level="complex" kind="branch"> <description>Branch to label if src1 is greater or equal to src2 (signed comparison).</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax> <token kind="register" /> <token kind="immediate" /> @@ -768,11 +540,7 @@ <instruction opcode="bgeu" level="complex" kind="branch"> <description>Branch to label if src1 is greater or equal to src2 (unsigned comparison).</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax> <token kind="register" /> <token kind="immediate" /> @@ -807,11 +575,7 @@ <instruction opcode="bgt" level="complex" kind="branch"> <description>Branch to label if src1 is greater than src2 (signed comparison).</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax> <token kind="register" /> <token kind="immediate" /> @@ -821,11 +585,7 @@ <instruction opcode="bgtu" level="complex" kind="branch"> <description>Branch to label if src1 is greater than src2 (unsigned comparison).</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax> <token kind="register" /> <token kind="immediate" /> @@ -848,11 +608,7 @@ <instruction opcode="ble" level="complex" kind="branch"> <description>Branch to label if src1 is lower or equal to src2 (signed comparison).</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax> <token kind="register" /> <token kind="immediate" /> @@ -862,11 +618,7 @@ <instruction opcode="bleu" level="complex" kind="branch"> <description>Branch to label if src1 is lower or equal to src2 (unsigned comparison).</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax> <token kind="register" /> <token kind="immediate" /> @@ -889,11 +641,7 @@ <instruction opcode="blt" level="complex" kind="branch"> <description>Branch to label if src1 is lower than src2 (signed comparison).</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax> <token kind="register" /> <token kind="immediate" /> @@ -903,11 +651,7 @@ <instruction opcode="bltu" level="complex" kind="branch"> <description>Branch to label if src1 is lower than src2 (unsigned comparison).</description> - <syntax> - <token kind="register" /> - <token kind="register" /> - <token kind="label" /> - </syntax> + <predefinedSyntax template="jump" /> <syntax> <token kind="register" /> <token kind="immediate" />

1 0