type Label = String
type Comment = String
type Ascii = String
+type LineNo = Word32
data DTF =
DTF_Data Address Value Code Label Comment | -- 0;...
DTF_Comment Comment | -- 2;...
DTF_Label Label Comment Address | -- 3;...
-- types for intern processing
- DTF_InstrToParse Address ValueToParse Code Label Comment |
+ DTF_InstrToParse Address ValueToParse Code Label Comment LineNo |
DTF_SectionToDet Address Value Code Label Comment |
DTF_Org Address |
DTF_Define Label Value Comment |
showsDTF (DTF_Instr a v c l s) = (++) (datins "1" a v c l s)
showsDTF (DTF_Comment c) = (++) (printf "2;%s\n" c)
showsDTF (DTF_Label l c _) = (++) (printf "3;%s;%s\n" l c)
-showsDTF (DTF_InstrToParse a v c l s) = (++) (printf "itp;%08x;%s;%s;%s;%s\n" a v c l s)
+showsDTF (DTF_InstrToParse a v c l s lno) = (++) (printf "itp;%08x;%s;%s;%s;%s@%d\n" a v c l s lno)
showsDTF (DTF_SectionToDet a v c l s) = (++) (datins "std" a v c l s)
showsDTF (DTF_Org a) = (++) (printf "org;%08x\n" a)
showsDTF (DTF_Define l a c) = (++) (printf "def;%s;%08x;%s\n" l a c)
parseInstr :: [DictElem] -> [DTF] -> [DTF]
parseInstr _ [] = []
-parseInstr dict ((DTF_InstrToParse a instr c l s):xs) =
+parseInstr dict ((DTF_InstrToParse a instr c l s lno):xs) =
(DTF_Instr a bytecode c l s):(parseInstr dict xs)
where
- bytecode = case (parse (instruction (a,dict)) "" (instr++"\n")) of
+ bytecode = case (parse (instruction lno (a,dict)) "" (instr++"\n")) of
Left err -> error ("couldn't parse Instruction: " ++ instr ++ "\n" ++ show err)
Right x -> x
parseInstr dict (x:xs) = x:(parseInstr dict xs)
inc = ((+) 4)
-convertDTF :: [(Int,String)] -> DT_State -> Counter -> Counter -> [DictElem] -> ([DictElem], [DTF])
+convertDTF :: [(LineNo,String)] -> DT_State -> Counter -> Counter -> [DictElem] -> ([DictElem], [DTF])
convertDTF [] _ _ _ d = (d,[])
convertDTF ((lno,str):xs) state datacnt instrcnt dict = (newdict, (actlist newdtf))
where
| state == InText = instrcnt + (4*rep)
| otherwise = instrcnt
ninstrcnt (DTF_Instr _ _ _ _ _) = inc instrcnt
- ninstrcnt (DTF_InstrToParse _ _ _ _ _) = inc instrcnt
+ ninstrcnt (DTF_InstrToParse _ _ _ _ _ _) = inc instrcnt
ninstrcnt _ = instrcnt
nstate (DTF_State s) = s
ndict (DTF_Label l _ a) = dict `add_elem` (l,a)
ndict (DTF_SectionToDet a _ _ l _) = dict `add_elem` (l,a)
- ndict (DTF_InstrToParse a _ _ l _) = dict `add_elem` (l,a)
+ ndict (DTF_InstrToParse a _ _ l _ _) = dict `add_elem` (l,a)
ndict (DTF_Data a _ _ l _) = dict `add_elem` (l,a)
ndict (DTF_Instr a _ _ l _) = dict `add_elem` (l,a)
ndict (DTF_Define l v _) = dict `add_elem` (l,v)
| otherwise = error $ "don't use .ascii in .text here: " ++ c
ndict _ = dict
- newdtf = case (parse (parseDTFLine dict) "" (str++"\n")) of
+ newdtf = case (parse (parseDTFLine lno dict) "" (str++"\n")) of
Left err -> error ("couldn't parse line " ++ (show lno) ++ ": " ++ (show err))
Right (DTF_SectionToDet _ v c l s) ->
case state of
NoState -> error "missing .data or .text"
InData -> (DTF_Data datacnt v c l s)
InText -> (DTF_Instr instrcnt v c l s)
- Right (DTF_InstrToParse _ v c l s) ->
- (DTF_InstrToParse instrcnt v c l s)
+ Right (DTF_InstrToParse _ v c l s ln) ->
+ (DTF_InstrToParse instrcnt v c l s ln)
Right y@(DTF_Org _) ->
case state of
NoState -> error "missing .data or .text"
testDTF :: String -> IO ()
testDTF input =
- case (parse (parseDTFLine dict) "" (input++"\n")) of
+ case (parse (parseDTFLine 0 dict) "" (input++"\n")) of
Left err -> do { putStr "failz ;(\n"; print err}
Right x -> do { print x }
where
dict = [("lolz", 0x1337), ("rofl", 0xaaaa)]
-parseDTFLine :: [DictElem] -> Parser DTF
-parseDTFLine dict = foldl1 (<|>) (fmap (\x -> try (x dict)) lineFormats) <* char '\n'
+parseDTFLine :: LineNo -> [DictElem] -> Parser DTF
+parseDTFLine lno dict = foldl1 (<|>) (fmap (\x -> try (x lno dict)) lineFormats) <* char '\n'
lineFormats = [lf_define, lf_sdata, lf_stext, lf_org, lf_data, lf_ifill, lf_ascii, lf_comment, lf_toparse, lf_label, lf_nothing]
parseConst d = expr d
-- teh pars0rs
-lf_data d = do
+lf_data _ d = do
l <- try (parseLabel) <|> string ""
skipMany space
fill <- string ".fill "
comment <- try(parseComment) <|> parseMySpaces
return $ DTF_Fill r val (fill ++ (if repeat == "1" then "" else repeat) ++ code) l comment
-lf_ifill d = do
+lf_ifill lno d = do
l <- try (parseLabel) <|> string ""
skipMany space
fill <- string ".ifill "
code <- many1 $ noneOf "\n;"
- let val = case parse (instruction (0,d)) "" (code++"\n") of
+ let val = case parse (instruction lno (0,d)) "" (code++"\n") of
Right v -> v
Left err -> error $ show err
comment <- try(parseComment) <|> parseMySpaces
return $ DTF_Fill 1 val (fill ++ code) l comment
-lf_ascii _ = do
+lf_ascii _ _ = do
l <- try (parseLabel) <|> string ""
skipMany space
ascii <- string ".ascii "
comment <- try(parseComment) <|> parseMySpaces
return $ DTF_Ascii str (ascii ++ "\"" ++ str ++ "\"") l comment
-lf_comment _ = do
+lf_comment _ _ = do
comment <- parseComment
return $ DTF_Comment comment
-lf_nothing _ = do
+lf_nothing _ _ = do
wtf <- parseMySpaces
return $ DTF_Comment wtf
-lf_label _ = do
+lf_label _ _ = do
l <- parseLabel
comment <- try(parseComment) <|> parseMySpaces
return $ DTF_Label l comment 0
-lf_toparse _ = do
+lf_toparse lno _ = do
l <- try(parseLabel) <|> string ""
skipMany space
code <- many1 $ noneOf "\n;"
comment <- try(parseComment) <|> parseMySpaces
- return $ DTF_InstrToParse 0 code code l comment
+ return $ DTF_InstrToParse 0 code code l comment lno
-lf_org d = do
+lf_org _ d = do
skipMany space
string ".org"
val <- parseConst d
parseMySpaces
return $ DTF_Org val
-lf_sdata _ = do
+lf_sdata _ _ = do
skipMany space
string ".data"
parseMySpaces
return $ DTF_State InData
-lf_stext _ = do
+lf_stext _ _ = do
skipMany space
string ".text"
parseMySpaces
return $ DTF_State InText
-lf_define d = do
+lf_define _ d = do
skipMany space
string ".define"
parseMySpaces