From 5d9b22635acbb021c85fb26ccf69194a77d2c15d Mon Sep 17 00:00:00 2001
From: Lars Even Almaas <larseven@gmail.com>
Date: Thu, 19 Nov 2020 12:13:19 +0100
Subject: [PATCH] Added enhanced pic8 platform (#2910)

---
 cli/cmdlineparser.cpp       |  4 ++++
 platforms/pic8-enhanced.xml | 18 ++++++++++++++++++
 win_installer/cppcheck.wxs  |  1 +
 3 files changed, 23 insertions(+)
 create mode 100644 platforms/pic8-enhanced.xml

diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
index 144872942..5673a6c8f 100644
--- a/cli/cmdlineparser.cpp
+++ b/cli/cmdlineparser.cpp
@@ -1130,6 +1130,10 @@ void CmdLineParser::printHelp()
               "                                 8 bit AVR microcontrollers\n"
               "                          * pic8\n"
               "                                 8 bit PIC microcontrollers\n"
+              "                                 Baseline and mid-range architectures\n"
+              "                          * pic8-enhanced\n"
+              "                                 8 bit PIC microcontrollers\n"
+              "                                 Enhanced mid-range and high end (PIC18) architectures\n"
               "                          * pic16\n"
               "                                 16 bit PIC microcontrollers\n"
               "                          * mips32\n"
diff --git a/platforms/pic8-enhanced.xml b/platforms/pic8-enhanced.xml
new file mode 100644
index 000000000..a5cd45e35
--- /dev/null
+++ b/platforms/pic8-enhanced.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<platform>
+  <char_bit>8</char_bit>
+  <default-sign>unsigned</default-sign>
+  <sizeof>
+    <bool>1</bool>
+    <short>2</short>
+    <int>2</int>
+    <long>4</long>
+    <long-long>8</long-long>
+    <float>4</float>
+    <double>4</double>
+    <long-double>4</long-double>
+    <pointer>2</pointer>
+    <size_t>2</size_t>
+    <wchar_t>2</wchar_t>
+  </sizeof>
+</platform>
diff --git a/win_installer/cppcheck.wxs b/win_installer/cppcheck.wxs
index f7c958344..86004bae1 100644
--- a/win_installer/cppcheck.wxs
+++ b/win_installer/cppcheck.wxs
@@ -133,6 +133,7 @@
               <File Id='arm64wchar_t4.xml' Name='arm64-wchar_t4.xml' Source='$(var.PtfsDir)\arm64-wchar_t4.xml' />
               <File Id='avr8.xml' Name='avr8.xml' Source='$(var.PtfsDir)\avr8.xml' />
               <File Id='pic8.xml' Name='pic8.xml' Source='$(var.PtfsDir)\pic8.xml' />
+              <File Id='pic8-enhanced.xml' Name='pic8-enhanced.xml' Source='$(var.PtfsDir)\pic8-enhanced.xml' />
               <File Id='pic16.xml' Name='pic16.xml' Source='$(var.PtfsDir)\pic16.xml' />
               <File Id='mips32.xml' Name='mips32.xml' Source='$(var.PtfsDir)\mips32.xml' />
               <File Id='cray_sv1.xml' Name='cray_sv1.xml' Source='$(var.PtfsDir)\cray_sv1.xml' />