From 0e6a93d4fdbcd25d3205b6ca658cb45e61903123 Mon Sep 17 00:00:00 2001 From: Tyler L Date: Wed, 23 May 2018 03:51:24 -0700 Subject: [PATCH] init --- .gitignore | 3 ++ ChangeLog.md | 3 ++ LICENSE | 30 ++++++++++++++ README.md | 1 + Setup.hs | 2 + app/Main.hs | 6 +++ package.yaml | 52 +++++++++++++++++++++++++ src/SixtyFiveOhTwo/Instruction.hs | 47 ++++++++++++++++++++++ stack.yaml | 65 +++++++++++++++++++++++++++++++ test/Spec.hs | 2 + 10 files changed, 211 insertions(+) create mode 100644 .gitignore create mode 100644 ChangeLog.md create mode 100644 LICENSE create mode 100644 README.md create mode 100644 Setup.hs create mode 100644 app/Main.hs create mode 100644 package.yaml create mode 100644 src/SixtyFiveOhTwo/Instruction.hs create mode 100644 stack.yaml create mode 100644 test/Spec.hs diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..115b585 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.stack-work/ +dsl-sixty-five-oh-two.cabal +*~ \ No newline at end of file diff --git a/ChangeLog.md b/ChangeLog.md new file mode 100644 index 0000000..3d7459b --- /dev/null +++ b/ChangeLog.md @@ -0,0 +1,3 @@ +# Changelog for dsl-sixty-five-oh-two + +## Unreleased changes diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..e037c72 --- /dev/null +++ b/LICENSE @@ -0,0 +1,30 @@ +Copyright Author name here (c) 2018 + +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + + * Neither the name of Author name here nor the names of other + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md new file mode 100644 index 0000000..bce553f --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# dsl-sixty-five-oh-two diff --git a/Setup.hs b/Setup.hs new file mode 100644 index 0000000..9a994af --- /dev/null +++ b/Setup.hs @@ -0,0 +1,2 @@ +import Distribution.Simple +main = defaultMain diff --git a/app/Main.hs b/app/Main.hs new file mode 100644 index 0000000..2db676e --- /dev/null +++ b/app/Main.hs @@ -0,0 +1,6 @@ +module Main where + +import SixtyFiveOhTwo.Instruction + +main :: IO () +main = putStrLn "Compiled" diff --git a/package.yaml b/package.yaml new file mode 100644 index 0000000..d1ebc9d --- /dev/null +++ b/package.yaml @@ -0,0 +1,52 @@ +name: dsl-sixty-five-oh-two +version: 0.1.0.0 +github: "githubuser/dsl-sixty-five-oh-two" +license: BSD3 +author: "Author name here" +maintainer: "example@example.com" +copyright: "2018 Author name here" + +extra-source-files: +- README.md +- ChangeLog.md + +# Metadata used when publishing your package +# synopsis: Short description of your package +# category: Web + +# To avoid duplicated efforts in documentation and dealing with the +# complications of embedding Haddock markup inside cabal files, it is +# common to point users to the README.md file. +description: Please see the README on GitHub at + +dependencies: +- base >= 4.7 && < 5 +- mtl +- containers +- lens +- bytestring + +library: + source-dirs: src + +executables: + dsl-sixty-five-oh-two-exe: + main: Main.hs + source-dirs: app + ghc-options: + - -threaded + - -rtsopts + - -with-rtsopts=-N + dependencies: + - dsl-sixty-five-oh-two + +tests: + dsl-sixty-five-oh-two-test: + main: Spec.hs + source-dirs: test + ghc-options: + - -threaded + - -rtsopts + - -with-rtsopts=-N + dependencies: + - dsl-sixty-five-oh-two diff --git a/src/SixtyFiveOhTwo/Instruction.hs b/src/SixtyFiveOhTwo/Instruction.hs new file mode 100644 index 0000000..05fdfe8 --- /dev/null +++ b/src/SixtyFiveOhTwo/Instruction.hs @@ -0,0 +1,47 @@ +{-# LANGUAGE TemplateHaskell #-} + +module SixtyFiveOhTwo.Instruction where + +import Control.Monad.State +import qualified Data.ByteString as B +import qualified Data.Map.Strict as M +import Control.Lens +import Data.Word + +data InstructionState = InstructionState { + -- The functionTable relates functions to their byte offsets in the compiled code + _functionTable :: M.Map String Int, + _bytestring :: B.ByteString +} +makeLenses ''InstructionState + +type Instruction = State InstructionState InstructionState + +data AddressingMode = + Implied | + Accumulator | + Immediate Word8 | + Relative Word8 | -- Signed + Absolute Word16 | + AbsoluteX Word16 | + AbsoluteY Word16 | + ZeroPage Word8 | + ZeroPageX Word8 | + ZeroPageY Word8 | + ZeroPageIndirect Word8 | + Indirect Word16 | + IndirectX Word8 | + IndirectY Word8 + + +define :: String -> Instruction -> Instruction +define name definition = do + insState <- get + let insState' = over functionTable (\fT -> M.insert name (B.length $ insState ^. bytestring) fT) insState + -- TODO: COMBINE THE FUNCTION DEFINITIONS HERE TOO NOT JUST BYTESTRINGS + return $ execState definition insState' + +adc :: AddressingMode -> Instruction +adc (Immediate b) = do + insState <- get + return $ over bytestring (\bs -> B.append bs (B.pack [0x69, b])) insState \ No newline at end of file diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..8235b57 --- /dev/null +++ b/stack.yaml @@ -0,0 +1,65 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# https://docs.haskellstack.org/en/stable/yaml_configuration/ + +# Resolver to choose a 'specific' stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# resolver: lts-3.5 +# resolver: nightly-2015-09-21 +# resolver: ghc-7.10.2 +# resolver: ghcjs-0.1.0_ghc-7.10.2 +# +# The location of a snapshot can be provided as a file or url. Stack assumes +# a snapshot provided as a file might change, whereas a url resource does not. +# +# resolver: ./custom-snapshot.yaml +# resolver: https://example.com/snapshots/2018-01-01.yaml +resolver: lts-11.9 + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# - location: +# git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# subdirs: +# - auto-update +# - wai +packages: +- . +# Dependency packages to be pulled from upstream that are not in the resolver +# using the same syntax as the packages field. +# (e.g., acme-missiles-0.3) +# extra-deps: [] + +# Override default flag values for local packages and extra-deps +# flags: {} + +# Extra package databases containing global packages +# extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=1.7" +# +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor \ No newline at end of file diff --git a/test/Spec.hs b/test/Spec.hs new file mode 100644 index 0000000..cd4753f --- /dev/null +++ b/test/Spec.hs @@ -0,0 +1,2 @@ +main :: IO () +main = putStrLn "Test suite not yet implemented"