Skip to content

Commit e049b01

Browse files
committed
feat: Add FASM support
1 parent c2a9d71 commit e049b01

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

lisp/jcs-package.el

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@
168168
exec-path-from-shell
169169
execrun
170170
expand-region
171+
fasm-mode
171172
fb2-reader
172173
feature-mode
173174
ff-guard

modules/lang/asm/config.el

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
;;; lang/asm/config.el -*- lexical-binding: t; -*-
22

3+
(require 'fasm-mode)
34
(require 'masm-mode)
45
(require 'nasm-mode)
56

@@ -111,19 +112,25 @@
111112
(interactive
112113
(list (completing-read
113114
"Major mode for this Assembly Language file: "
114-
'("masm" "nasm"))))
115+
'("fasm" "masm" "nasm"))))
115116
(pcase mode
117+
("fasm" (fasm-mode))
116118
("masm" (masm-mode))
117119
("nasm" (nasm-mode))))
118120

119121
(file-header-defsrc jcs-asm-ask-source
120122
"Major source for this Assembly Language file: "
121-
'(("masm" . "Microsoft Macro Assembler")
123+
'(("fasm" . "Flat Assembler")
124+
("masm" . "Microsoft Macro Assembler")
122125
("nasm" . "Netwide Assembler"))
123126
(let ((jcs-asm--asking-mode t))
124127
(pcase index
125-
(0 (masm-mode) (jcs-insert-masm-template))
126-
(1 (nasm-mode) (jcs-insert-nasm-template)))))
128+
(0 (fasm-mode) (jcs-insert-fasm-template))
129+
(1 (masm-mode) (jcs-insert-masm-template))
130+
(2 (nasm-mode) (jcs-insert-nasm-template)))))
131+
132+
(file-header-defins jcs-insert-fasm-template "assembly" "fasm/default.txt"
133+
"Header for FASM file.")
127134

128135
(file-header-defins jcs-insert-masm-template "assembly" "masm/default.txt"
129136
"Header for MASM file.")
@@ -135,14 +142,7 @@
135142
;; (@* "Hook" )
136143
;;
137144

138-
(jcs-add-hook 'masm-mode-hook
139-
(modify-syntax-entry ?_ "w")
140-
(jcs-asm-mode--init)
141-
(jcs-key-local
142-
`(((kbd "RET") . jcs-asm-return)
143-
((kbd ";") . jcs-asm-comment))))
144-
145-
(jcs-add-hook 'nasm-mode-hook
145+
(jcs-add-hook '(fasm-mode-hook masm-mode-hook nasm-mode-hook)
146146
(modify-syntax-entry ?_ "w")
147147
(jcs-asm-mode--init)
148148
(jcs-key-local

0 commit comments

Comments
 (0)