diff options
| author | Dominik Picheta <dominikpicheta@googlemail.com> | 2015-08-26 23:21:26 +0100 |
|---|---|---|
| committer | Dominik Picheta <dominikpicheta@googlemail.com> | 2015-08-26 23:21:26 +0100 |
| commit | 887869d9532b82f5aac0222afb1ce8ccb81fdfb1 (patch) | |
| tree | 463c04a734e204c261078cf25e25b407797b6323 | |
| parent | 20c2b008227028c52d4ba2349c69dd76d9ed65ab (diff) | |
| parent | 66ff1792fa803b305d66edc3e520c3a5e8d8d470 (diff) | |
| download | Nim-887869d9532b82f5aac0222afb1ce8ccb81fdfb1.tar.gz | |
Merge pull request #3251 from jck/msp430
add msp430 cpu support
| -rw-r--r-- | compiler/platform.nim | 5 | ||||
| -rw-r--r-- | lib/system/platforms.nim | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/compiler/platform.nim b/compiler/platform.nim index c4e7d453a..8376c2b32 100644 --- a/compiler/platform.nim +++ b/compiler/platform.nim @@ -159,7 +159,7 @@ type # alias conditionals to condsyms (end of module). cpuNone, cpuI386, cpuM68k, cpuAlpha, cpuPowerpc, cpuPowerpc64, cpuPowerpc64el, cpuSparc, cpuVm, cpuIa64, cpuAmd64, cpuMips, cpuMipsel, - cpuArm, cpuArm64, cpuJS, cpuNimrodVM, cpuAVR + cpuArm, cpuArm64, cpuJS, cpuNimrodVM, cpuAVR, cpuMSP430 type TEndian* = enum @@ -186,7 +186,8 @@ const (name: "arm64", intSize: 64, endian: littleEndian, floatSize: 64, bit: 64), (name: "js", intSize: 32, endian: bigEndian,floatSize: 64,bit: 32), (name: "nimrodvm", intSize: 32, endian: bigEndian, floatSize: 64, bit: 32), - (name: "avr", intSize: 16, endian: littleEndian, floatSize: 32, bit: 16)] + (name: "avr", intSize: 16, endian: littleEndian, floatSize: 32, bit: 16), + (name: "msp430", intSize: 16, endian: littleEndian, floatSize: 32, bit: 16)] var targetCPU*, hostCPU*: TSystemCPU diff --git a/lib/system/platforms.nim b/lib/system/platforms.nim index 0a7045fae..eeada5c51 100644 --- a/lib/system/platforms.nim +++ b/lib/system/platforms.nim @@ -28,6 +28,7 @@ type arm64, ## ARM64 based processor vm, ## Some Virtual machine: Nim's VM or JavaScript avr ## AVR based processor + msp430 ## TI MSP430 microcontroller OsPlatform* {.pure.} = enum ## the OS this program will run on. none, dos, windows, os2, linux, morphos, skyos, solaris, @@ -76,5 +77,6 @@ const elif defined(arm64): CpuPlatform.arm64 elif defined(vm): CpuPlatform.vm elif defined(avr): CpuPlatform.avr + elif defined(msp430): CpuPlatform.msp430 else: CpuPlatform.none ## the CPU this program will run on. |