X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Femacs%2Fllvm-mode.el;h=05900992a3cd18963a2d2e9bc6758a639c14af3d;hb=0a4627d71f8f836558ef05c9739b560e82412687;hp=c1a317e4ad0ce6a31cb74fb022e2e8c9352b7f92;hpb=4817a5ea3db0b8ff2e1ce1bd8cbf0849ea27a3ef;p=oota-llvm.git

diff --git a/utils/emacs/llvm-mode.el b/utils/emacs/llvm-mode.el
index c1a317e4ad0..05900992a3c 100644
--- a/utils/emacs/llvm-mode.el
+++ b/utils/emacs/llvm-mode.el
@@ -1,6 +1,6 @@
-;; Maintainer:  The LLVM team, http://llvm.cs.uiuc.edu/
+;; Maintainer:  The LLVM team, http://llvm.org/
 ;; Description: Major mode for the LLVM assembler language.
-;; Updated:     2003-06-02
+;; Updated:     2007-09-19
 
 ;; Create mode-specific tables.
 (defvar llvm-mode-syntax-table nil
@@ -18,24 +18,24 @@
    '("\"[^\"]+\"" . font-lock-string-face)
    ;; Unnamed variable slots
    '("%[-]?[0-9]+" . font-lock-variable-name-face)
+   ;; Types
+   '("\\bvoid\\b\\|\\bi[0-9]+\\b\\|\\float\\b\\|\\bdouble\\b\\|\\btype\\b\\|\\blabel\\b\\|\\bopaque\\b" . font-lock-type-face)
    ;; Integer literals
-   '("[-]?[0-9]+" . font-lock-preprocessor-face)
+   '("\\b[-]?[0-9]+\\b" . font-lock-preprocessor-face)
    ;; Floating point constants
-   '("[-+]?[0-9]+\.[0-9]*\([eE][-+]?[0-9]+\)?" . font-lock-preprocessor-face)
+   '("\\b[-+]?[0-9]+\.[0-9]*\([eE][-+]?[0-9]+\)?\\b" . font-lock-preprocessor-face)
    ;; Hex constants
-   '("0x[0-9A-Fa-f]+" . font-lock-preprocessor-face)
+   '("\\b0x[0-9A-Fa-f]+\\b" . font-lock-preprocessor-face)
    ;; Keywords
-   '("begin\\|end\\|true\\|false\\|declare\\|global\\|constant\\|const\\|internal\\|linkonce\\|appending\\|uninitialized\\|implementation\\|\\.\\.\\.\\|null\\|to\\|except\\|not\\|target\\|endian\\|little\\|big\\|pointersize" . font-lock-keyword-face)
-   ;; Types
-   '("void\\|bool\\|sbyte\\|ubyte\\|u?short\\|u?int\\|u?long\\|float\\|double\\|type\\|label\\|opaque" . font-lock-type-face)
+   '("\\bbegin\\b\\|\\bend\\b\\|\\btrue\\b\\|\\bfalse\\b\\|\\bzeroinitializer\\b\\|\\bdeclare\\b\\|\\bdefine\\b\\|\\bglobal\\b\\|\\bconstant\\b\\|\\bconst\\b\\|\\binternal\\b\\|\\blinkonce\\b\\|\\bweak\\b\\|\\bappending\\b\\|\\buninitialized\\b\\|\\bimplementation\\b\\|\\b\\.\\.\\.\\b\\|\\bnull\\b\\|\\bundef\\b\\|\\bto\\b\\|\\bexcept\\b\\|\\bnot\\b\\|\\btarget\\b\\|\\bendian\\b\\|\\blittle\\b\\|\\bbig\\b\\|\\bpointersize\\b\\|\\bdeplibs\\b\\|\\bvolatile\\b\\|\\bfastcc\\b\\|\\bcoldcc\\b\\|\\bcc\\b" . font-lock-keyword-face)
    ;; Arithmetic and Logical Operators
-   '("add\\|sub\\|mul\\|div\\|rem\\|and\\|or\\|xor\\|set\\(ne\\|eq\\|lt\\|gt\\|le\\|ge\\)" . font-lock-keyword-face)
+   '("\\badd\\b\\|\\bsub\\b\\|\\bmul\\b\\|\\bdiv\\b\\|\\brem\\b\\|\\band\\b\\|\\bor\\b\\|\\bxor\\b\\|\\bset\\(ne\\b\\|\\beq\\b\\|\\blt\\b\\|\\bgt\\b\\|\\ble\\b\\|\\bge\\b\\)" . font-lock-keyword-face)
    ;; Special instructions
-   '("phi\\|call\\|cast\\|to\\|shl\\|shr\\|va_arg" . font-lock-keyword-face)
+   '("\\bphi\\b\\|\\btail\\b\\|\\bcall\\b\\|\\bcast\\b\\|\\bselect\\b\\|\\bto\\b\\|\\bshl\\b\\|\\bshr\\b\\|\\bvaarg\\b\\|\\bvanext\\b" . font-lock-keyword-face)
    ;; Control instructions
-   '("ret\\|br\\|switch\\|invoke" . font-lock-keyword-face)
+   '("\\bret\\b\\|\\bbr\\b\\|\\bswitch\\b\\|\\binvoke\\b\\|\\bunwind\\b\\|\\bunreachable\\b" . font-lock-keyword-face)
    ;; Memory operators
-   '("malloc\\|alloca\\|free\\|load\\|store\\|getelementptr" . font-lock-keyword-face)
+   '("\\bmalloc\\b\\|\\balloca\\b\\|\\bfree\\b\\|\\bload\\b\\|\\bstore\\b\\|\\bgetelementptr\\b" . font-lock-keyword-face)
    )
   "Syntax highlighting for LLVM"
   )
@@ -108,20 +108,21 @@
   (use-local-map llvm-mode-map)         ; Provides the local keymap.
   (setq major-mode 'llvm-mode)          
 
-  (make-local-variable	'font-lock-defaults)
+  (make-local-variable 'font-lock-defaults)
   (setq major-mode 'llvm-mode           ; This is how describe-mode
                                         ;   finds the doc string to print.
-	mode-name "LLVM"                ; This name goes into the modeline.
-	font-lock-defaults `(llvm-font-lock-keywords))
+  mode-name "LLVM"                      ; This name goes into the modeline.
+  font-lock-defaults `(llvm-font-lock-keywords))
 
   (setq local-abbrev-table llvm-mode-abbrev-table)
   (set-syntax-table llvm-mode-syntax-table)
+  (setq comment-start ";")
   (run-hooks 'llvm-mode-hook))          ; Finally, this permits the user to
                                         ;   customize the mode with a hook.
 
 ;; Associate .ll files with llvm-mode
 (setq auto-mode-alist
-      (append '(("\\.ll$" . llvm-mode)) auto-mode-alist))
+   (append '(("\\.ll$" . llvm-mode) ("\\.llx$" . llvm-mode)) auto-mode-alist))
 
 (provide 'llvm-mode)
 ;; end of llvm-mode.el