summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ngspice-nghdl.tar.xzbin4493772 -> 4053164 bytes
-rw-r--r--src/createKicadLibrary.py543
-rw-r--r--src/ghdlserver/ghdlserver.c515
-rw-r--r--src/ghdlserver/ghdlserver.h20
-rw-r--r--src/model_generation.py130
-rwxr-xr-xsrc/ngspice_ghdl.py51
-rw-r--r--src/outitf.c62
7 files changed, 787 insertions, 534 deletions
diff --git a/ngspice-nghdl.tar.xz b/ngspice-nghdl.tar.xz
index f32a0a8..c9dc8ca 100644
--- a/ngspice-nghdl.tar.xz
+++ b/ngspice-nghdl.tar.xz
Binary files differ
diff --git a/src/createKicadLibrary.py b/src/createKicadLibrary.py
index 966c9d6..2b3e7d7 100644
--- a/src/createKicadLibrary.py
+++ b/src/createKicadLibrary.py
@@ -1,269 +1,274 @@
-from Appconfig import Appconfig
-import re
-import os
-import xml.etree.cElementTree as ET
-from PyQt4 import QtGui
-
-
-class AutoSchematic(QtGui.QWidget):
-
- def __init__(self, modelname):
- QtGui.QWidget.__init__(self)
- self.modelname = modelname.split('.')[0]
- self.template = Appconfig.kicad_lib_template.copy()
- self.xml_loc = Appconfig.xml_loc
- self.lib_loc = Appconfig.lib_loc
- self.kicad_nghdl_lib = '/usr/share/kicad/library/eSim_Nghdl.lib'
- self.parser = Appconfig.parser_nghdl
-
- def createKicadLibrary(self):
- xmlFound = None
- for root, dirs, files in os.walk(self.xml_loc):
- if (str(self.modelname) + '.xml') in files:
- xmlFound = root
- print(xmlFound)
- if xmlFound is None:
- self.getPortInformation()
- self.createXML()
- self.createLib()
- elif (xmlFound == self.xml_loc + '/Nghdl'):
- print('Library already exists...')
- ret = QtGui.QMessageBox.warning(
- self, "Warning", '''<b>Library files for this model ''' +
- '''already exist. Do you want to overwrite it?</b><br/>
- If yes press ok, else cancel it and ''' +
- '''change the name of your vhdl file.''',
- QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel
- )
- if ret == QtGui.QMessageBox.Ok:
- print("Overwriting existing libraries")
- self.getPortInformation()
- self.createXML()
- self.removeOldLibrary() # Removes the exisitng library
- self.createLib()
- else:
- print("Exiting Nghdl")
- quit()
- else:
- print('Pre existing library...')
- ret = QtGui.QMessageBox.critical(
- self, "Error", '''<b>A standard library already exists ''' +
- '''with this name.</b><br/><b>Please change the name ''' +
- '''of your vhdl file and upload it again</b>''',
- QtGui.QMessageBox.Ok
- )
-
- # quit()
-
- def getPortInformation(self):
- portInformation = PortInfo(self)
- portInformation.getPortInfo()
- self.portInfo = portInformation.bit_list
- self.input_length = portInformation.input_len
-
- def createXML(self):
- cwd = os.getcwd()
- xmlDestination = os.path.join(self.xml_loc, 'Nghdl')
- self.splitText = ""
- for bit in self.portInfo[:-1]:
- self.splitText += bit + "-V:"
- self.splitText += self.portInfo[-1] + "-V"
-
- print("changing directory to ", xmlDestination)
- os.chdir(xmlDestination)
-
- root = ET.Element("model")
- ET.SubElement(root, "name").text = self.modelname
- ET.SubElement(root, "type").text = "Nghdl"
- ET.SubElement(root, "node_number").text = str(len(self.portInfo))
- ET.SubElement(root, "title").text = (
- "Add parameters for " + str(self.modelname))
- ET.SubElement(root, "split").text = self.splitText
- param = ET.SubElement(root, "param")
- ET.SubElement(param, "rise_delay", default="1.0e-9").text = (
- "Enter Rise Delay (default=1.0e-9)")
- ET.SubElement(param, "fall_delay", default="1.0e-9").text = (
- "Enter Fall Delay (default=1.0e-9)")
- ET.SubElement(param, "input_load", default="1.0e-12").text = (
- "Enter Input Load (default=1.0e-12)")
- ET.SubElement(param, "instance_id", default="1").text = (
- "Enter Instance ID (Between 0-99)")
- tree = ET.ElementTree(root)
- tree.write(str(self.modelname) + '.xml')
- print("Leaving the directory ", xmlDestination)
- os.chdir(cwd)
-
- # Calculates the maximum between input and output ports
- def findBlockSize(self):
- ind = self.input_length
- return max(
- self.char_sum(self.portInfo[:ind]),
- self.char_sum(self.portInfo[ind:])
- )
-
- def char_sum(self, ls):
- return sum([int(x) for x in ls])
-
- def removeOldLibrary(self):
- cwd = os.getcwd()
- os.chdir(self.lib_loc)
- print("Changing directory to ", self.lib_loc)
- f = open(self.kicad_nghdl_lib)
- lines = f.readlines()
- f.close()
-
- output = []
- line_reading_flag = False
-
- for line in lines:
- if line.startswith("DEF"):
- if line.split()[1] == self.modelname:
- line_reading_flag = True
- if not line_reading_flag:
- output.append(line)
- if line.startswith("ENDDEF"):
- line_reading_flag = False
-
- f = open(self.kicad_nghdl_lib, 'w')
- for line in output:
- f.write(line)
-
- os.chdir(cwd)
- print("Leaving directory, ", self.lib_loc)
-
- def createLib(self):
- self.dist_port = 100 # Distance between two ports
- self.inc_size = 100 # Increment size of a block
- cwd = os.getcwd()
- os.chdir(self.lib_loc)
- print("Changing directory to ", self.lib_loc)
-
- lib_file = open(self.kicad_nghdl_lib, "a")
- line1 = self.template["start_def"]
- line1 = line1.split()
- line1 = [w.replace('comp_name', self.modelname) for w in line1]
- self.template["start_def"] = ' '.join(line1)
- if os.stat(self.kicad_nghdl_lib).st_size == 0:
- lib_file.write("EESchema-LIBRARY Version 2.3" + "\n\n")
- # lib_file.write("#encoding utf-8"+ "\n"+ "#"+ "\n" +
- # "#test_compo" + "\n"+ "#"+ "\n")
- lib_file.write(
- self.template["start_def"] + "\n" + self.template["U_field"]+"\n"
- )
-
- line3 = self.template["comp_name_field"]
- line3 = line3.split()
- line3 = [w.replace('comp_name', self.modelname) for w in line3]
- self.template["comp_name_field"] = ' '.join(line3)
-
- lib_file.write(self.template["comp_name_field"] + "\n")
-
- line4 = self.template["blank_field"]
- line4_1 = line4[0]
- line4_2 = line4[1]
- line4_1 = line4_1.split()
- line4_1 = [w.replace('blank_quotes', '""') for w in line4_1]
- line4_2 = line4_2.split()
- line4_2 = [w.replace('blank_quotes', '""') for w in line4_2]
- line4[0] = ' '.join(line4_1)
- line4[1] = ' '.join(line4_2)
- self.template["blank_qoutes"] = line4
-
- lib_file.write(
- line4[0] + "\n" + line4[1] + "\n" +
- self.template["start_draw"] + "\n"
- )
-
- draw_pos = self.template["draw_pos"]
- draw_pos = draw_pos.split()
- draw_pos[4] = str(
- int(draw_pos[4]) - self.findBlockSize() * self.inc_size)
- self.template["draw_pos"] = ' '.join(draw_pos)
-
- lib_file.write(self.template["draw_pos"]+"\n")
-
- input_port = self.template["input_port"]
- input_port = input_port.split()
- output_port = self.template["output_port"]
- output_port = output_port.split()
- inputs = self.portInfo[0: self.input_length]
- outputs = self.portInfo[self.input_length:]
-
- print("INPUTS AND OUTPUTS ")
- print(inputs)
- print(outputs)
-
- inputs = self.char_sum(inputs)
- outputs = self.char_sum(outputs)
-
- total = inputs+outputs
-
- port_list = []
-
- for i in range(total):
- if (i < inputs):
- input_port[1] = "in" + str(i + 1)
- input_port[2] = str(i + 1)
- input_port[4] = str(int(input_port[4]) - self.dist_port)
- input_list = ' '.join(input_port)
- port_list.append(input_list)
-
- else:
- output_port[1] = "out" + str(i - inputs + 1)
- output_port[2] = str(i + 1)
- output_port[4] = str(int(output_port[4]) - self.dist_port)
- output_list = ' '.join(output_port)
- port_list.append(output_list)
-
- for ports in port_list:
- lib_file.write(ports+"\n")
- lib_file.write(
- self.template["end_draw"] + "\n" +
- self.template["end_def"] + "\n\n\n"
- )
-
- os.chdir(cwd)
- print('Leaving directory, ', self.lib_loc)
- QtGui.QMessageBox.information(
- self, "Library added",
- '''Library details for this model is added to the ''' +
- '''<b>eSim_Nghdl.lib</b> in the KiCad shared directory''',
- QtGui.QMessageBox.Ok
- )
-
-
-class PortInfo:
- def __init__(self, model):
- self.modelname = model.modelname
- self.model_loc = model.parser.get('NGSPICE', 'DIGITAL_MODEL')
- self.bit_list = []
- self.input_len = 0
-
- def getPortInfo(self):
- info_loc = os.path.join(self.model_loc, self.modelname+'/DUTghdl/')
- input_list = []
- output_list = []
- read_file = open(info_loc + 'connection_info.txt', 'r')
- data = read_file.readlines()
- read_file.close()
-
- for line in data:
- if re.match(r'^\s*$', line):
- pass
- else:
- in_items = re.findall(
- "IN", line, re.MULTILINE | re.IGNORECASE
- )
- out_items = re.findall(
- "OUT", line, re.MULTILINE | re.IGNORECASE
- )
- if in_items:
- input_list.append(line.split())
- if out_items:
- output_list.append(line.split())
-
- for in_list in input_list:
- self.bit_list.append(in_list[2])
- self.input_len = len(self.bit_list)
- for out_list in output_list:
- self.bit_list.append(out_list[2])
+from Appconfig import Appconfig
+import re
+import os
+import xml.etree.cElementTree as ET
+from PyQt4 import QtGui
+
+
+class AutoSchematic(QtGui.QWidget):
+
+ def __init__(self, modelname):
+ QtGui.QWidget.__init__(self)
+ self.modelname = modelname.split('.')[0]
+ self.template = Appconfig.kicad_lib_template.copy()
+ self.xml_loc = Appconfig.xml_loc
+ self.lib_loc = Appconfig.lib_loc
+ if os.name == 'nt':
+ eSim_src = Appconfig.src_home
+ inst_dir = eSim_src.replace('\eSim', '')
+ self.kicad_nghdl_lib = inst_dir + '/KiCad/share/kicad/library/eSim_Nghdl.lib'
+ else:
+ self.kicad_nghdl_lib = '/usr/share/kicad/library/eSim_Nghdl.lib'
+ self.parser = Appconfig.parser_nghdl
+
+ def createKicadLibrary(self):
+ xmlFound = None
+ for root, dirs, files in os.walk(self.xml_loc):
+ if (str(self.modelname) + '.xml') in files:
+ xmlFound = root
+ print(xmlFound)
+ if xmlFound is None:
+ self.getPortInformation()
+ self.createXML()
+ self.createLib()
+ elif (xmlFound == os.path.join(self.xml_loc, 'Nghdl')):
+ print('Library already exists...')
+ ret = QtGui.QMessageBox.warning(
+ self, "Warning", '''<b>Library files for this model ''' +
+ '''already exist. Do you want to overwrite it?</b><br/>
+ If yes press ok, else cancel it and ''' +
+ '''change the name of your vhdl file.''',
+ QtGui.QMessageBox.Ok, QtGui.QMessageBox.Cancel
+ )
+ if ret == QtGui.QMessageBox.Ok:
+ print("Overwriting existing libraries")
+ self.getPortInformation()
+ self.createXML()
+ self.removeOldLibrary() # Removes the exisitng library
+ self.createLib()
+ else:
+ print("Exiting Nghdl")
+ quit()
+ else:
+ print('Pre existing library...')
+ ret = QtGui.QMessageBox.critical(
+ self, "Error", '''<b>A standard library already exists ''' +
+ '''with this name.</b><br/><b>Please change the name ''' +
+ '''of your vhdl file and upload it again</b>''',
+ QtGui.QMessageBox.Ok
+ )
+
+ # quit()
+
+ def getPortInformation(self):
+ portInformation = PortInfo(self)
+ portInformation.getPortInfo()
+ self.portInfo = portInformation.bit_list
+ self.input_length = portInformation.input_len
+
+ def createXML(self):
+ cwd = os.getcwd()
+ xmlDestination = os.path.join(self.xml_loc, 'Nghdl')
+ self.splitText = ""
+ for bit in self.portInfo[:-1]:
+ self.splitText += bit + "-V:"
+ self.splitText += self.portInfo[-1] + "-V"
+
+ print("changing directory to ", xmlDestination)
+ os.chdir(xmlDestination)
+
+ root = ET.Element("model")
+ ET.SubElement(root, "name").text = self.modelname
+ ET.SubElement(root, "type").text = "Nghdl"
+ ET.SubElement(root, "node_number").text = str(len(self.portInfo))
+ ET.SubElement(root, "title").text = (
+ "Add parameters for " + str(self.modelname))
+ ET.SubElement(root, "split").text = self.splitText
+ param = ET.SubElement(root, "param")
+ ET.SubElement(param, "rise_delay", default="1.0e-9").text = (
+ "Enter Rise Delay (default=1.0e-9)")
+ ET.SubElement(param, "fall_delay", default="1.0e-9").text = (
+ "Enter Fall Delay (default=1.0e-9)")
+ ET.SubElement(param, "input_load", default="1.0e-12").text = (
+ "Enter Input Load (default=1.0e-12)")
+ ET.SubElement(param, "instance_id", default="1").text = (
+ "Enter Instance ID (Between 0-99)")
+ tree = ET.ElementTree(root)
+ tree.write(str(self.modelname) + '.xml')
+ print("Leaving the directory ", xmlDestination)
+ os.chdir(cwd)
+
+ # Calculates the maximum between input and output ports
+ def findBlockSize(self):
+ ind = self.input_length
+ return max(
+ self.char_sum(self.portInfo[:ind]),
+ self.char_sum(self.portInfo[ind:])
+ )
+
+ def char_sum(self, ls):
+ return sum([int(x) for x in ls])
+
+ def removeOldLibrary(self):
+ cwd = os.getcwd()
+ os.chdir(self.lib_loc)
+ print("Changing directory to ", self.lib_loc)
+ f = open(self.kicad_nghdl_lib)
+ lines = f.readlines()
+ f.close()
+
+ output = []
+ line_reading_flag = False
+
+ for line in lines:
+ if line.startswith("DEF"):
+ if line.split()[1] == self.modelname:
+ line_reading_flag = True
+ if not line_reading_flag:
+ output.append(line)
+ if line.startswith("ENDDEF"):
+ line_reading_flag = False
+
+ f = open(self.kicad_nghdl_lib, 'w')
+ for line in output:
+ f.write(line)
+
+ os.chdir(cwd)
+ print("Leaving directory, ", self.lib_loc)
+
+ def createLib(self):
+ self.dist_port = 100 # Distance between two ports
+ self.inc_size = 100 # Increment size of a block
+ cwd = os.getcwd()
+ os.chdir(self.lib_loc)
+ print("Changing directory to ", self.lib_loc)
+
+ lib_file = open(self.kicad_nghdl_lib, "a")
+ line1 = self.template["start_def"]
+ line1 = line1.split()
+ line1 = [w.replace('comp_name', self.modelname) for w in line1]
+ self.template["start_def"] = ' '.join(line1)
+ if os.stat(self.kicad_nghdl_lib).st_size == 0:
+ lib_file.write("EESchema-LIBRARY Version 2.3" + "\n\n")
+ # lib_file.write("#encoding utf-8"+ "\n"+ "#"+ "\n" +
+ # "#test_compo" + "\n"+ "#"+ "\n")
+ lib_file.write(
+ self.template["start_def"] + "\n" + self.template["U_field"]+"\n"
+ )
+
+ line3 = self.template["comp_name_field"]
+ line3 = line3.split()
+ line3 = [w.replace('comp_name', self.modelname) for w in line3]
+ self.template["comp_name_field"] = ' '.join(line3)
+
+ lib_file.write(self.template["comp_name_field"] + "\n")
+
+ line4 = self.template["blank_field"]
+ line4_1 = line4[0]
+ line4_2 = line4[1]
+ line4_1 = line4_1.split()
+ line4_1 = [w.replace('blank_quotes', '""') for w in line4_1]
+ line4_2 = line4_2.split()
+ line4_2 = [w.replace('blank_quotes', '""') for w in line4_2]
+ line4[0] = ' '.join(line4_1)
+ line4[1] = ' '.join(line4_2)
+ self.template["blank_qoutes"] = line4
+
+ lib_file.write(
+ line4[0] + "\n" + line4[1] + "\n" +
+ self.template["start_draw"] + "\n"
+ )
+
+ draw_pos = self.template["draw_pos"]
+ draw_pos = draw_pos.split()
+ draw_pos[4] = str(
+ int(draw_pos[4]) - self.findBlockSize() * self.inc_size)
+ self.template["draw_pos"] = ' '.join(draw_pos)
+
+ lib_file.write(self.template["draw_pos"]+"\n")
+
+ input_port = self.template["input_port"]
+ input_port = input_port.split()
+ output_port = self.template["output_port"]
+ output_port = output_port.split()
+ inputs = self.portInfo[0: self.input_length]
+ outputs = self.portInfo[self.input_length:]
+
+ print("INPUTS AND OUTPUTS ")
+ print(inputs)
+ print(outputs)
+
+ inputs = self.char_sum(inputs)
+ outputs = self.char_sum(outputs)
+
+ total = inputs+outputs
+
+ port_list = []
+
+ for i in range(total):
+ if (i < inputs):
+ input_port[1] = "in" + str(i + 1)
+ input_port[2] = str(i + 1)
+ input_port[4] = str(int(input_port[4]) - self.dist_port)
+ input_list = ' '.join(input_port)
+ port_list.append(input_list)
+
+ else:
+ output_port[1] = "out" + str(i - inputs + 1)
+ output_port[2] = str(i + 1)
+ output_port[4] = str(int(output_port[4]) - self.dist_port)
+ output_list = ' '.join(output_port)
+ port_list.append(output_list)
+
+ for ports in port_list:
+ lib_file.write(ports+"\n")
+ lib_file.write(
+ self.template["end_draw"] + "\n" +
+ self.template["end_def"] + "\n\n\n"
+ )
+
+ os.chdir(cwd)
+ print('Leaving directory, ', self.lib_loc)
+ QtGui.QMessageBox.information(
+ self, "Library added",
+ '''Library details for this model is added to the ''' +
+ '''<b>eSim_Nghdl.lib</b> in the KiCad shared directory''',
+ QtGui.QMessageBox.Ok
+ )
+
+
+class PortInfo:
+ def __init__(self, model):
+ self.modelname = model.modelname
+ self.model_loc = model.parser.get('NGSPICE', 'DIGITAL_MODEL')
+ self.bit_list = []
+ self.input_len = 0
+
+ def getPortInfo(self):
+ info_loc = os.path.join(self.model_loc, self.modelname+'/DUTghdl/')
+ input_list = []
+ output_list = []
+ read_file = open(info_loc + 'connection_info.txt', 'r')
+ data = read_file.readlines()
+ read_file.close()
+
+ for line in data:
+ if re.match(r'^\s*$', line):
+ pass
+ else:
+ in_items = re.findall(
+ "IN", line, re.MULTILINE | re.IGNORECASE
+ )
+ out_items = re.findall(
+ "OUT", line, re.MULTILINE | re.IGNORECASE
+ )
+ if in_items:
+ input_list.append(line.split())
+ if out_items:
+ output_list.append(line.split())
+
+ for in_list in input_list:
+ self.bit_list.append(in_list[2])
+ self.input_len = len(self.bit_list)
+ for out_list in output_list:
+ self.bit_list.append(out_list[2])
diff --git a/src/ghdlserver/ghdlserver.c b/src/ghdlserver/ghdlserver.c
index 1b1e706..410a2ff 100644
--- a/src/ghdlserver/ghdlserver.c
+++ b/src/ghdlserver/ghdlserver.c
@@ -1,8 +1,11 @@
/************************************************************************************
* <ghdlserver.c> eSim Team, FOSSEE, IIT-Bombay
************************************************************************************
+ * 8.June.2020 - Bladen Martin - Added OS (Windows and Linux) dependent
+ * - Rahul Paknikar preprocessors for ease of maintenance
+ *
* 28.May.2020 - Bladen Martin - Termination of testbench: Replaced Process ID
- * mechanism with socket connection from client
+ * - Rahul Paknikar mechanism with socket connection from client
* receiving the special close message
************************************************************************************
************************************************************************************
@@ -29,36 +32,46 @@
#include "ghdlserver.h"
#include "uthash.h"
#include <fcntl.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <signal.h>
#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <sys/time.h>
-#include <netinet/in.h>
-#include <netdb.h>
+#include <sys/types.h>
+#include <sys/time.h>
#include <limits.h>
#include <time.h>
#include <errno.h>
-#include <syslog.h>
+
+#ifdef __linux__
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+ #include <syslog.h>
+#elif _WIN32
+ #include <ws2tcpip.h>
+ #include <winsock2.h>
+ #include <eventsys.h>
+ #include <windows.h>
+#endif
#define _XOPEN_SOURCE 500
#define MAX_NUMBER_PORT 100
#define NGSPICE "ngspice" // 17.Mar.2017 - RM
-static FILE* pid_file;
+static FILE *pid_file;
static char pid_filename[80];
-static char* Out_Port_Array[MAX_NUMBER_PORT];
-static int out_port_num = 0;
+static char *Out_Port_Array[MAX_NUMBER_PORT];
+static int out_port_num = 0;
static int server_socket_id = -1;
static int sendto_sock; // 22.Feb.2017 - RM - Kludge
static int prev_sendto_sock; // 22.Feb.2017 - RM - Kludge
-static int pid_file_created; // 10.Mar.2017 - RM
+static int pid_file_created; // 10.Mar.2017 - RM
-extern char* __progname; // 26.Feb.2017 May not be portable to non-GNU systems.
+#ifdef __linux__
+ extern char* __progname; // 26.Feb.2017 May not be portable to non-GNU systems.
+#endif
void Vhpi_Exit(int sig);
@@ -76,7 +89,7 @@ static char* curtim(void)
{
static char ct[50];
struct timeval tv;
- struct tm* ptm;
+ struct tm *ptm;
long milliseconds;
char time_string[40];
@@ -91,48 +104,52 @@ static char* curtim(void)
#ifdef DEBUG
-static void print_hash_table(void)
+static void print_hash_table(void)
{
struct my_struct *sptr;
-
- for(sptr=users; sptr != NULL; sptr=sptr->hh.next)
- syslog(LOG_INFO, "Hash table:val:%s: key: %s", sptr->val, sptr->key);
+
+ #ifdef __linux__
+ for(sptr = users; sptr != NULL; sptr = sptr->hh.next)
+ syslog(LOG_INFO, "Hash table:val:%s: key: %s", sptr->val, sptr->key);
+ #endif
}
#endif
-static void parse_buffer(int sock_id, char* receive_buffer)
+static void parse_buffer(int sock_id, char *receive_buffer)
{
static int rcvnum;
+
+ #ifdef __linux__
+ syslog(LOG_INFO, "RCVD RCVN:%d from CLT:%d buffer : %s",
+ rcvnum++, sock_id, receive_buffer);
+ #endif
- syslog(LOG_INFO,"RCVD RCVN:%d from CLT:%d buffer : %s",
- rcvnum++, sock_id,receive_buffer);
-
- /*Parsing buffer to store in hash table */
+ /*Parsing buffer to store in hash table */
char *rest;
char *token;
- char *ptr1=receive_buffer;
+ char *ptr1 = receive_buffer;
char *var;
char *value;
- // Processing tokens.
- while(token = strtok_r(ptr1, ",", &rest))
- {
- ptr1 = rest;
- while(var=strtok_r(token, ":", &value))
- {
- s = (struct my_struct*)malloc(sizeof(struct my_struct));
- strncpy(s->key, var, 64);
- strncpy(s->val, value, 64);
- HASH_ADD_STR(users, key, s );
- break;
- }
- }
-
- s = (struct my_struct*)malloc(sizeof(struct my_struct));
- strncpy(s->key, "sock_id", 64);
- snprintf(s->val,64, "%d", sock_id);
- HASH_ADD_STR(users, key, s);
+ // Processing tokens.
+ while (token = strtok_r(ptr1, ",", &rest))
+ {
+ ptr1 = rest;
+ while (var = strtok_r(token, ":", &value))
+ {
+ s = (struct my_struct *) malloc(sizeof(struct my_struct));
+ strncpy(s->key, var, 64);
+ strncpy(s->val, value, 64);
+ HASH_ADD_STR(users, key, s);
+ break;
+ }
+ }
+
+ s = (struct my_struct *) malloc(sizeof(struct my_struct));
+ strncpy(s->key, "sock_id", 64);
+ snprintf(s->val, 64, "%d", sock_id);
+ HASH_ADD_STR(users, key, s);
}
@@ -140,47 +157,67 @@ static void parse_buffer(int sock_id, char* receive_buffer)
// 26.Sept.2019 - RP - added parameter of socket ip
static int create_server(int port_number, char my_ip[], int max_connections)
{
- int sockfd, reuse = 1;
- struct sockaddr_in serv_addr;
+ int sockfd, reuse = 1;
+ struct sockaddr_in serv_addr;
+
+ sockfd = socket(AF_INET, SOCK_STREAM, 0);
+
+ if (sockfd < 0)
+ {
+ #ifdef __linux__
+ fprintf(stderr, "%s- Error: in opening socket at server \n", __progname);
+
+ #elif _WIN32
+ fprintf(stderr, "Error: in opening socket at server \n");
- sockfd = socket(AF_INET, SOCK_STREAM, 0);
+ #endif
- if (sockfd < 0)
- {
- fprintf(stderr, "%s- Error: in opening socket at server \n", __progname);
- //exit(1);
- return -1;
- }
+ //exit(1);
+ return -1;
+ }
+ /* 18.May.2020 - BM - typecast optval field to char* */
/* 20.Mar.2017 - RM - SO_REUSEADDR option. To take care of TIME_WAIT state.*/
- int ret = setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &reuse, sizeof(int));
-
- /* 08.Nov.2019 - RP - SO_REUSEPORT and SO_DONTROUTE option.*/
- ret += setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &reuse, sizeof(int));
- ret += setsockopt(sockfd, SOL_SOCKET, SO_DONTROUTE, &reuse, sizeof(int));
-
- if (ret < 0)
- {
- syslog(LOG_ERR, "create_server:setsockopt() failed....");
- // close(sockfd);
- // return -1;
- }
-
- bzero((char *) &serv_addr, sizeof(serv_addr));
- serv_addr.sin_family = AF_INET;
- serv_addr.sin_addr.s_addr = inet_addr(my_ip); // 26.Sept.2019 - RP - Bind to specific IP only
- serv_addr.sin_port = htons(port_number);
-
- if (bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
- {
- fprintf(stderr,"%s- Error: could not bind socket to port %d\n",
- __progname, port_number);
- syslog(LOG_ERR, "Error: could not bind socket to port %d", port_number);
- close(sockfd);
- exit(1);
- }
-
- // Start listening on the server.
+ int ret = setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (char *) &reuse, sizeof(int));
+
+ /* 08.Nov.2019 - RP - SO_REUSEPORT and SO_DONTROUTE option.*/
+ /* 08.June.2020 - BM - SO_REUSEPORT only available in Linux */
+ #ifdef __linux__
+ ret += setsockopt(sockfd, SOL_SOCKET, SO_REUSEPORT, &reuse, sizeof(int));
+ #endif
+
+ ret += setsockopt(sockfd, SOL_SOCKET, SO_DONTROUTE, (char *) &reuse, sizeof(int));
+ if (ret < 0)
+ {
+ #ifdef __linux__
+ syslog(LOG_ERR, "create_server:setsockopt() failed....");
+ #endif
+ // close(sockfd);
+ // return -1;
+ }
+
+ memset(&serv_addr, 0, sizeof(serv_addr));
+ serv_addr.sin_family = AF_INET;
+ serv_addr.sin_addr.s_addr = inet_addr(my_ip); // 26.Sept.2019 - RP - Bind to specific IP only
+ serv_addr.sin_port = htons(port_number);
+
+ if (bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0)
+ {
+ #ifdef __linux__
+ fprintf(stderr, "%s- Error: could not bind socket to port %d\n", __progname, port_number);
+ syslog(LOG_ERR, "Error: could not bind socket to port %d", port_number);
+ close(sockfd);
+
+ #elif _WIN32
+ fprintf(stderr, "Error: could not bind socket to port %d\n", port_number);
+ closesocket(sockfd);
+
+ #endif
+
+ exit(1);
+ }
+
+ // Start listening on the server.
listen(sockfd, max_connections);
return sockfd;
@@ -188,37 +225,42 @@ static int create_server(int port_number, char my_ip[], int max_connections)
// The server to wait (blocking) for a client connection.
-static int connect_to_client(int server_fd)
-{
- int ret_val = 0;
- int newsockfd = -1;
- socklen_t clilen;
- struct sockaddr_in cli_addr;
-
- clilen = sizeof(cli_addr);
-
- /* 08.Nov.2019 - RP - Blocking Socket (Accept) */
- newsockfd = accept(server_fd, (struct sockaddr *) &cli_addr, &clilen);
- if (newsockfd >= 0)
- {
- syslog(LOG_INFO, "SRV:%d New Client Connection CLT:%d", server_fd, newsockfd);
- }
- else
- {
- syslog(LOG_ERR,"Error: failed in accept(), socket=%d", server_fd);
- exit(1);
- }
+static int connect_to_client(int server_fd)
+{
+ int ret_val = 0;
+ int newsockfd = -1;
+ socklen_t clilen;
+ struct sockaddr_in cli_addr;
- return newsockfd;
-}
+ clilen = sizeof(cli_addr);
+
+ /* 08.Nov.2019 - RP - Blocking Socket (Accept) */
+ newsockfd = accept(server_fd, (struct sockaddr *) &cli_addr, &clilen);
+ if (newsockfd >= 0)
+ {
+ #ifdef _linux_
+ syslog(LOG_INFO, "SRV:%d New Client Connection CLT:%d", server_fd, newsockfd);
+ #endif
+ }
+ else
+ {
+ #ifdef __linux__
+ syslog(LOG_ERR, "Error: failed in accept(), socket=%d", server_fd);
+ #endif
+
+ exit(1);
+ }
+
+ return newsockfd;
+}
//Receive string from socket and put it inside buffer.
-static void receive_string(int sock_id, char* buffer)
-{
- int nbytes = 0;
+static void receive_string(int sock_id, char *buffer)
+{
+ int nbytes = 0;
- /* 08.Nov.2019 - RP - Blocking Socket - Receive */
+ /* 08.Nov.2019 - RP - Blocking Socket - Receive */
nbytes = recv(sock_id, buffer, MAX_BUF_SIZE, 0);
if (nbytes <= 0)
{
@@ -235,51 +277,62 @@ static void receive_string(int sock_id, char* buffer)
}
-static void Data_Send(int sockid)
-{
- static int trnum;
- char* out;
+static void Data_Send(int sockid)
+{
+ static int trnum;
+ char *out;
- int i;
- char colon = ':';
- char semicolon = ';';
- int wrt_retries = 0;
- int ret;
+ int i;
+ char colon = ':';
+ char semicolon = ';';
+ int wrt_retries = 0;
+ int ret;
- s = NULL;
+ s = NULL;
- out = calloc(1, 2048);
+ out = calloc(1, 2048);
- // 5.July.2019 - RP - loop to send all ports at once for an event
- for (i=0; i<out_port_num; i++)
- {
- HASH_FIND_STR(users,Out_Port_Array[i],s);
- if (strcmp(Out_Port_Array[i], s->key) == 0)
- {
- strncat(out, s->key, strlen(s->key));
+ // 5.July.2019 - RP - loop to send all ports at once for an event
+ for (i = 0; i < out_port_num; i++)
+ {
+ HASH_FIND_STR(users, Out_Port_Array[i], s);
+ if (strcmp(Out_Port_Array[i], s->key) == 0)
+ {
+ strncat(out, s->key, strlen(s->key));
strncat(out, &colon, 1);
strncat(out, s->val, strlen(s->val));
strncat(out, &semicolon, 1);
}
else
{
- syslog(LOG_ERR,"The %s's value not found in the table.",
- Out_Port_Array[i]);
+ #ifdef __linux__
+ syslog(LOG_ERR,"The %s's value not found in the table.",
+ Out_Port_Array[i]);
+ #endif
+
free(out);
+ printf("Error! The %s's value not found in the table. Exiting simulation...",
+ Out_Port_Array[i]);
return;
}
}
- /* 08.Nov.2019 - RP - Blocking Socket (Send) */
- if ((send(sockid, out, strlen(out), 0)) == -1)
- {
- syslog(LOG_ERR,"Failure sending to CLT:%d buffer:%s", sockid, out);
- exit(1);
- }
+ /* 08.Nov.2019 - RP - Blocking Socket (Send) */
+ if ((send(sockid, out, strlen(out), 0)) == -1)
+ {
+ #ifdef __linux__
+ syslog(LOG_ERR, "Failure sending to CLT:%d buffer:%s", sockid, out);
+ #endif
- syslog(LOG_INFO,"SNT:TRNUM:%d to CLT:%d buffer: %s", trnum++, sockid, out);
- free(out);
-}
+ exit(1);
+ }
+
+ #ifdef __linux__
+ syslog(LOG_INFO, "SNT:TRNUM:%d to CLT:%d buffer: %s", trnum++, sockid, out);
+ #endif
+
+ free(out);
+}
// 26.Sept.2019 - RP - added parameter of socket ip
@@ -287,94 +340,125 @@ void Vhpi_Initialize(int sock_port, char sock_ip[])
{
DEFAULT_SERVER_PORT = sock_port;
- signal(SIGINT,Vhpi_Exit);
- signal(SIGTERM,Vhpi_Exit);
- signal(SIGUSR1, Vhpi_Exit); //10.Mar.2017 - RM
+ signal(SIGINT, Vhpi_Exit);
+ signal(SIGTERM, Vhpi_Exit);
+
+ #ifdef _WIN32
+ WSADATA WSAData;
+ WSAStartup(MAKEWORD(2, 2), &WSAData);
+ #endif
int try_limit = 100;
- while(try_limit > 0)
- {
- // 26.Sept.2019 - RP
- server_socket_id = create_server(DEFAULT_SERVER_PORT, sock_ip, DEFAULT_MAX_CONNECTIONS);
+ while (try_limit > 0)
+ {
+ // 26.Sept.2019 - RP
+ server_socket_id = create_server(DEFAULT_SERVER_PORT, sock_ip, DEFAULT_MAX_CONNECTIONS);
- if(server_socket_id >= 0)
+ if (server_socket_id >= 0)
{
- syslog(LOG_INFO,"Started the server on port %d SRV:%d",
+ #ifdef __linux__
+ syslog(LOG_INFO, "Started the server on port %d SRV:%d",
DEFAULT_SERVER_PORT, server_socket_id);
+ #endif
+
break;
}
-
- syslog(LOG_ERR,"Could not start server on port %d,will try again",
+
+ #ifdef __linux__
+ syslog(LOG_ERR, "Could not start server on port %d,will try again",
DEFAULT_SERVER_PORT);
+ #endif
+
usleep(1000);
try_limit--;
-
- if(try_limit==0)
+
+ if (try_limit == 0)
{
- syslog(LOG_ERR,
+ #ifdef __linux__
+ syslog(LOG_ERR,
"Error:Tried to start server on port %d, failed..giving up.",
DEFAULT_SERVER_PORT);
+ #endif
+
exit(1);
}
}
-
- //Reading Output Port name and storing in Out_Port_Array;
- char* line = NULL;
- size_t len = 0;
+
+ //Reading Output Port name and storing in Out_Port_Array;
+ char *line = NULL;
+ size_t len = 0;
ssize_t read;
char *token;
FILE *fp;
struct timespec ts;
- fp=fopen("connection_info.txt","r");
+ fp = fopen("connection_info.txt", "r");
if (!fp)
{
- syslog(LOG_ERR,"Vhpi_Initialize: Failed to open connection_info.txt. Exiting...");
+ #ifdef __linux__
+ syslog(LOG_ERR,"Vhpi_Initialize: Failed to open connection_info.txt. Exiting...");
+ #endif
+
exit(1);
}
- line = (char*) malloc(80);
- while ((read = getline(&line, &len, fp)) != -1)
- {
- if (strstr(line,"OUT") != NULL || strstr(line,"out") != NULL)
- {
- strtok_r(line, " ",&token);
- Out_Port_Array[out_port_num] = line;
- out_port_num++;
- }
- line = (char*) malloc(80);
- }
+ line = (char *) malloc(80);
+
+ #ifdef __linux__
+ while ((read = getline(&line, &len, fp)) != -1)
+ {
+ if (strstr(line, "OUT") != NULL || strstr(line, "out") != NULL)
+ {
+ strtok_r(line, " ", &token);
+ Out_Port_Array[out_port_num] = line;
+ out_port_num++;
+ }
+ line = (char *) malloc(80);
+ }
+
+ #elif _WIN32
+ while (fgets(line, sizeof(line), fp) != NULL)
+ {
+ if (strstr(line, "OUT") != NULL || strstr(line, "out") != NULL)
+ {
+ strtok_r(line, " ", &token);
+ Out_Port_Array[out_port_num] = line;
+ out_port_num++;
+ }
+ line = (char *) malloc(80);
+ }
+
+ #endif
+
fclose(fp);
free(line);
ts.tv_sec = 2;
ts.tv_nsec = 0;
nanosleep(&ts, NULL);
-
- // 10.Mar.2017 - RM - Create PID file for the test bench.
}
-void Vhpi_Set_Port_Value(char *port_name,char *port_value,int port_width)
+void Vhpi_Set_Port_Value(char *port_name, char *port_value, int port_width)
{
- s = (struct my_struct*)malloc(sizeof(struct my_struct));
- strncpy(s->key, port_name,64);
- strncpy(s->val,port_value,64);
- HASH_ADD_STR( users, key, s );
+ s = (struct my_struct *) malloc(sizeof(struct my_struct));
+ strncpy(s->key, port_name, 64);
+ strncpy(s->val, port_value, 64);
+ HASH_ADD_STR(users, key, s);
}
-void Vhpi_Get_Port_Value(char* port_name,char* port_value,int port_width)
+void Vhpi_Get_Port_Value(char *port_name, char *port_value, int port_width)
{
- HASH_FIND_STR(users,port_name,s);
- if(s)
- {
- snprintf(port_value,sizeof(port_value),"%s",s->val);
- HASH_DEL(users, s);
- free(s);
- s=NULL;
- }
+ HASH_FIND_STR(users, port_name, s);
+ if (s)
+ {
+ snprintf(port_value, sizeof(port_value), "%s", s->val);
+ HASH_DEL(users, s);
+ free(s);
+ s = NULL;
+ }
}
@@ -383,36 +467,55 @@ void Vhpi_Listen()
sendto_sock = connect_to_client(server_socket_id); // 22.Feb.2017 - RM - Kludge
char receive_buffer[MAX_BUF_SIZE];
receive_string(sendto_sock, receive_buffer);
-
- syslog(LOG_INFO, "Vhpi_Listen:New socket connection CLT:%d",sendto_sock);
- if(strcmp(receive_buffer, "END")==0)
+ #ifdef __linux__
+ syslog(LOG_INFO, "Vhpi_Listen:New socket connection CLT:%d", sendto_sock);
+ #endif
+
+ if (strcmp(receive_buffer, "END") == 0)
{
- syslog(LOG_INFO, "RCVD:CLOSE REQUEST from CLT:%d", sendto_sock);
+ #ifdef __linux__
+ syslog(LOG_INFO, "RCVD:CLOSE REQUEST from CLT:%d", sendto_sock);
+ #endif
+
Vhpi_Exit(0);
- }
+ }
- parse_buffer(sendto_sock, receive_buffer);
+ parse_buffer(sendto_sock, receive_buffer);
}
-void Vhpi_Send()
+void Vhpi_Send()
{
-// 22.Feb.2017 - RM - Kludge
- if (prev_sendto_sock != sendto_sock)
- {
- Data_Send(sendto_sock);
+ // 22.Feb.2017 - RM - Kludge
+ if (prev_sendto_sock != sendto_sock)
+ {
+ Data_Send(sendto_sock);
- close(prev_sendto_sock); // 08.Nov.2019 - RP - Close previous socket
- prev_sendto_sock = sendto_sock;
- }
-// 22.Feb.2017 End kludge
+ #ifdef __linux__
+ close(prev_sendto_sock); // 08.Nov.2019 - RP - Close previous socket
+
+ #elif _WIN32
+ closesocket(prev_sendto_sock);
+
+ #endif
+
+ prev_sendto_sock = sendto_sock;
+ }
+ // 22.Feb.2017 End kludge
}
-void Vhpi_Exit(int sig)
-{
- close(server_socket_id);
- syslog(LOG_INFO, "*** Closed VHPI link. Exiting... ***");
- exit(0);
-}
+void Vhpi_Exit(int sig)
+{
+ #ifdef __linux__
+ close(server_socket_id);
+ syslog(LOG_INFO, "*** Closed VHPI link. Exiting... ***");
+
+ #elif _WIN32
+ closesocket(server_socket_id);
+
+ #endif
+
+ exit(0);
+} \ No newline at end of file
diff --git a/src/ghdlserver/ghdlserver.h b/src/ghdlserver/ghdlserver.h
index 9f23f0b..e04209b 100644
--- a/src/ghdlserver/ghdlserver.h
+++ b/src/ghdlserver/ghdlserver.h
@@ -1,13 +1,25 @@
/* 18.Mar.2017 - RM - Cleaned up.*/
+/* 20.June.2020 - BM - Added OS dependent includes*/
+#define _GNU_SOURCE
+#include <stdio.h>
#include <stdlib.h>
#include <stdint.h>
-#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netdb.h>
+#include<string.h>
+
+#ifdef __linux__
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+#elif _WIN32
+ #include<ws2tcpip.h>
+ #include<winsock2.h>
+ #include<eventsys.h>
+ #include<windows.h>
+#endif
+
// Should be enough..
#define MAX_BUF_SIZE 4096
diff --git a/src/model_generation.py b/src/model_generation.py
index eecd716..7baecc1 100644
--- a/src/model_generation.py
+++ b/src/model_generation.py
@@ -2,6 +2,7 @@
import re
import os
+from configparser import SafeConfigParser
class ModelGeneration:
@@ -13,6 +14,13 @@ class ModelGeneration:
self.fname = os.path.basename(file)
print("VHDL filename is : ", self.fname)
self.home = os.path.expanduser("~")
+ self.parser = SafeConfigParser()
+ self.parser.read(os.path.join(
+ self.home, os.path.join('.nghdl', 'config.ini')))
+ self.ngspice_home = self.parser.get('NGSPICE', 'NGSPICE_HOME')
+ self.release_dir = self.parser.get('NGSPICE', 'RELEASE')
+ self.src_home = self.parser.get('SRC', 'SRC_HOME')
+ self.licensefile = self.parser.get('SRC', 'LICENSE')
# #### Creating connection_info.txt file from vhdl file #### #
read_vhdl = open(file, 'r')
@@ -154,15 +162,25 @@ class ModelGeneration:
#include <math.h>
#include <string.h>
#include <time.h>
- #include <sys/socket.h>
#include <sys/types.h>
- #include <netinet/in.h>
- #include <netdb.h>
#include <stdlib.h>
#include <unistd.h>
#include <errno.h>
+
'''
+ if os.name == 'nt':
+ header += '''
+ #undef BOOLEAN
+ #include<winsock2.h>
+ '''
+ else:
+ header += '''
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netdb.h>
+ '''
+
function_open = (
'''void cm_''' + self.fname.split('.')[0] + '''(ARGS) \n{''')
@@ -177,7 +195,7 @@ class ModelGeneration:
// Declaring components of Client
FILE *log_client = NULL;
log_client=fopen("client.log","a");
- int socket_fd, bytes_recieved;
+ int bytes_recieved;
char send_data[1024];
char recv_data[1024];
char *key_iter;
@@ -186,6 +204,11 @@ class ModelGeneration:
int sock_port = 5000+PARAM(instance_id);
'''
+ if os.name != 'nt':
+ var_section += '''
+ int socket_fd;
+ '''
+
temp_input_var = []
for item in self.input_port:
temp_input_var.append(
@@ -262,8 +285,18 @@ class ModelGeneration:
char* my_ip = malloc(16);
char ip_filename[40];
- sprintf(ip_filename, "/tmp/NGHDL_COMMON_IP_%d.txt", getpid());
+ '''
+
+ if os.name == 'nt':
+ client_setup_ip += '''
+ sprintf(ip_filename, "C:/Windows/Temp/NGHDL_COMMON_IP_%d.txt", getpid());
+ '''
+ else:
+ client_setup_ip += '''
+ sprintf(ip_filename, "/tmp/NGHDL_COMMON_IP_%d.txt", getpid());
+ '''
+ client_setup_ip += '''
fptr = fopen(ip_filename, "r");
if (fptr)
{
@@ -276,10 +309,10 @@ class ModelGeneration:
fclose(fptr);
}
- if (ip_count < 255) {
+ if (ip_count < 254) {
sprintf(my_ip, "127.0.0.%d", ip_count+1);
} else {
- sprintf(my_ip, "127.0.%d.1", (ip_count+1)%256);
+ sprintf(my_ip, "127.0.%d.1", (ip_count+3)%256);
}
fptr = fopen(ip_filename, "a");
@@ -297,7 +330,16 @@ class ModelGeneration:
client_fetch_ip = '''
/* Client Fetch IP Addr */
+ '''
+
+ if os.name == 'nt':
+ client_fetch_ip += '''
+ WSADATA WSAData;
+ SOCKET socket_fd;
+ WSAStartup(MAKEWORD(2, 2), &WSAData);
+ '''
+ client_fetch_ip += '''
char* my_ip = STATIC_VAR(my_ip);
host = gethostbyname(my_ip);
@@ -397,7 +439,18 @@ class ModelGeneration:
if ( send(socket_fd,send_data,sizeof(send_data),0)==-1)
{
fprintf(stderr, "Client-Failure Sending Message \\n");
- close(socket_fd);
+ '''
+
+ if os.name == 'nt':
+ send_data += '''
+ closesocket(socket_fd);
+ '''
+ else:
+ send_data += '''
+ close(socket_fd);
+ '''
+
+ send_data += '''
exit(1);
}
else
@@ -430,7 +483,7 @@ class ModelGeneration:
for item in self.output_port:
sch_output_event.append(
- "\t/* Scheduling event and processing them */\n\
+ "\t/* Scheduling event and processing them */\n\
\tif((key_iter=strstr(recv_data, " + '"' + item.split(':')[0] + ':"'")) != NULL)\n\
\t{\n\
\t\twhile(*key_iter++ != ':');\n\
@@ -442,7 +495,7 @@ class ModelGeneration:
\t\t\telse if(*key_iter=='1')\n\t\t\t{\n\
\t\t\t\t_op_" + item.split(':')[0] + "[Ii]=ONE;\n\
\t\t\t}\n\t\t\telse\n\t\t\t{\n\
- \t\t\t\tfprintf(log_client,\"Unknow value return from server \\n\");\n\
+ \t\t\t\tfprintf(log_client,\"Unknown value return from server \\n\");\n\
\t\t\t\tprintf(\"Client-Unknown value return \\n\");\n\t\t\t}\n\n\
\t\t\tif(ANALYSIS == DC)\n\t\t\t{\n\
\t\t\t\tOUTPUT_STATE(" + item.split(':')[0] + "[Ii]) = _op_" + item.split(':')[0] + "[Ii];\n\
@@ -497,12 +550,24 @@ class ModelGeneration:
cfunc.write(client_setup_ip)
cfunc.write("\n")
cfunc.write("\t\tchar command[1024];\n")
- cfunc.write(
- '\t\tsnprintf(command,1024,"' + self.home +
- '/ngspice-nghdl/src/xspice/icm/ghdl/' +
- self.fname.split('.')[0] +
- '/DUTghdl/start_server.sh %d %s &",sock_port,my_ip);'
- )
+
+ if os.name == 'nt':
+ self.digital_home = self.parser.get('NGSPICE', 'DIGITAL_MODEL')
+ self.msys_home = self.parser.get('COMPILER', 'MSYS_HOME')
+ cmd_str2 = "\\'start_server.sh %d %s\\'" + "\\" + "\""
+ cmd_str1 = os.path.normpath("\"cd " + self.digital_home + "/" + self.fname.split(
+ '.')[0] + "/DUTghdl/ && " + self.msys_home + "/bash.exe -c ")
+ cmd_str1 = cmd_str1.replace("\\", "/")
+ cfunc.write('\t\tsnprintf(command,1024, "start /min cmd /c ' +
+ '\\' + cmd_str1 + cmd_str2 + ' &", sock_port, my_ip);')
+ else:
+ cfunc.write(
+ '\t\tsnprintf(command,1024,"' + self.home +
+ '/ngspice-nghdl/src/xspice/icm/ghdl/' +
+ self.fname.split('.')[0] +
+ '/DUTghdl/start_server.sh %d %s &", sock_port, my_ip);'
+ )
+
cfunc.write('\n\t\tsystem(command);')
cfunc.write("\n\t}")
cfunc.write("\n")
@@ -534,7 +599,10 @@ class ModelGeneration:
cfunc.write(item)
# Close socket fd
- cfunc.write("\tclose(socket_fd);\n\n")
+ if os.name == 'nt':
+ cfunc.write("\tclosesocket(socket_fd);\n\n")
+ else:
+ cfunc.write("\tclose(socket_fd);\n\n")
# close log_client file
cfunc.write("\tfclose(log_client);")
@@ -974,6 +1042,7 @@ class ModelGeneration:
def createServerScript(self):
# ####### Creating and writing components in start_server.sh ####### #
+ self.digital_home = self.parser.get('NGSPICE', 'DIGITAL_MODEL')
start_server = open('start_server.sh', 'w')
@@ -982,10 +1051,16 @@ class ModelGeneration:
"###This server run ghdl testebench for infinite time till " +
"ngspice send END signal to stop it\n\n"
)
- start_server.write(
- "cd "+self.home+"/ngspice-nghdl/src/xspice/icm/ghdl/" +
- self.fname.split('.')[0]+"/DUTghdl/\n"
- )
+
+ if os.name == 'nt':
+ pathstr = self.digital_home + "/" + \
+ self.fname.split('.')[0] + "/DUTghdl/"
+ pathstr = pathstr.replace("\\", "/")
+ start_server.write("cd "+pathstr+"\n")
+ else:
+ start_server.write("cd "+self.digital_home +
+ "/" + self.fname.split('.')[0] + "/DUTghdl/\n")
+
start_server.write("chmod 775 sock_pkg_create.sh &&\n")
start_server.write("./sock_pkg_create.sh $1 $2 &&\n")
start_server.write("ghdl -i *.vhdl &&\n")
@@ -994,10 +1069,15 @@ class ModelGeneration:
start_server.write(
"ghdl -a "+self.fname.split('.')[0]+"_tb.vhdl &&\n"
)
- start_server.write(
- "ghdl -e -Wl,ghdlserver.o " + self.fname.split('.')[0] + "_tb &&\n"
- )
- start_server.write("./"+self.fname.split('.')[0]+"_tb")
+
+ if os.name == 'nt':
+ start_server.write("ghdl -e -Wl,ghdlserver.o " +
+ "-Wl,libws2_32.a " + self.fname.split('.')[0] + "_tb &&\n")
+ start_server.write("./"+self.fname.split('.')[0]+"_tb.exe")
+ else:
+ start_server.write("ghdl -e -Wl,ghdlserver.o " +
+ self.fname.split('.')[0] + "_tb &&\n")
+ start_server.write("./"+self.fname.split('.')[0]+"_tb")
start_server.close()
diff --git a/src/ngspice_ghdl.py b/src/ngspice_ghdl.py
index 9991793..e873555 100755
--- a/src/ngspice_ghdl.py
+++ b/src/ngspice_ghdl.py
@@ -91,7 +91,7 @@ class Mainwindow(QtGui.QWidget):
def browseFile(self):
print("Browse button clicked")
self.filename = QtGui.QFileDialog.getOpenFileName(
- self, 'Open File', '.')
+ self, 'Open File', '.')
self.ledit.setText(self.filename)
print("Vhdl file uploaded to process :", self.filename)
@@ -140,7 +140,10 @@ class Mainwindow(QtGui.QWidget):
)
if ret == QtGui.QMessageBox.Ok:
print("Overwriting existing model " + self.modelname)
- cmd = "rm -rf " + self.modelname
+ if os.name == 'nt':
+ cmd = "rmdir " + self.modelname + "/s /q"
+ else:
+ cmd = "rm -rf " + self.modelname
# process = subprocess.Popen(
# cmd, stdout=subprocess.PIPE,
# stderr=subprocess.PIPE, shell=True
@@ -215,18 +218,30 @@ class Mainwindow(QtGui.QWidget):
shutil.copy(os.path.join(self.home, self.src_home) +
"/src/ghdlserver/Vhpi_Package.vhdl", path + "/DUTghdl/")
+ if os.name == 'nt':
+ shutil.copy(os.path.join(self.home, self.src_home) +
+ "/src/ghdlserver/libws2_32.a", path + "/DUTghdl/")
+
for file in self.file_list:
shutil.copy(str(file), path + "/DUTghdl/")
os.chdir(path + "/DUTghdl")
- subprocess.call("bash " + path + "/DUTghdl/compile.sh", shell=True)
- subprocess.call("chmod a+x start_server.sh", shell=True)
- subprocess.call("chmod a+x sock_pkg_create.sh", shell=True)
+ if os.name == 'nt':
+ # path to msys bin directory where bash is located
+ self.msys_bin = self.parser.get('COMPILER', 'MSYS_HOME')
+ subprocess.call(self.msys_bin+"/bash.exe " +
+ path + "/DUTghdl/compile.sh", shell=True)
+ subprocess.call(self.msys_bin+"/bash.exe -c " +
+ "'chmod a+x start_server.sh'", shell=True)
+ subprocess.call(self.msys_bin+"/bash.exe -c " +
+ "'chmod a+x sock_pkg_create.sh'", shell=True)
+ else:
+ subprocess.call("bash " + path + "/DUTghdl/compile.sh", shell=True)
+ subprocess.call("chmod a+x start_server.sh", shell=True)
+ subprocess.call("chmod a+x sock_pkg_create.sh", shell=True)
+
os.remove("compile.sh")
os.remove("ghdlserver.c")
- # os.remove("ghdlserver.h")
- # os.remove("Utility_Package.vhdl")
- # os.remove("Vhpi_Package.vhdl")
# Slot to redirect stdout and stderr to window console
@QtCore.pyqtSlot()
@@ -242,10 +257,18 @@ class Mainwindow(QtGui.QWidget):
def runMake(self):
print("run Make Called")
self.release_home = self.parser.get('NGSPICE', 'RELEASE')
- os.chdir(self.release_home)
+ path_icm = os.path.join(self.release_home, "src/xspice/icm")
+ os.chdir(path_icm)
+
try:
- cmd = " make"
- print("Running Make command in " + self.release_home)
+ if os.name == 'nt':
+ # path to msys bin directory where make is located
+ self.msys_bin = self.parser.get('COMPILER', 'MSYS_HOME')
+ cmd = self.msys_bin+"\\make.exe"
+ else:
+ cmd = " make"
+
+ print("Running Make command in " + path_icm)
path = os.getcwd() # noqa
self.process = QtCore.QProcess(self)
self.process.start(cmd)
@@ -257,7 +280,11 @@ class Mainwindow(QtGui.QWidget):
def runMakeInstall(self):
print("run Make Install Called")
try:
- cmd = " make install"
+ if os.name == 'nt':
+ self.msys_bin = self.parser.get('COMPILER', 'MSYS_HOME')
+ cmd = self.msys_bin+"\\make.exe install"
+ else:
+ cmd = " make install"
print("Running Make Install")
path = os.getcwd() # noqa
try:
diff --git a/src/outitf.c b/src/outitf.c
index 9f1a851..fe60f7a 100644
--- a/src/outitf.c
+++ b/src/outitf.c
@@ -11,12 +11,24 @@ Modified: 2000 AlansFixes, 2013/2015 patch by Krzysztof Blaszkowski
*/
/**************************************************************************
+ * 08.June.2020 - RP, BM - Added OS (Windows and Linux) dependent
+ * preprocessors and sockets
+ **************************************************************************
* 29.May.2020 - RP, BM - Read all the IPs and ports from NGHDL_COMMON_IP
* file from /tmp folder. It connects to each of the ghdlserver and sends
* CLOSE_FROM_NGSPICE message to terminate themselves
**************************************************************************/
#include "ngspice/ngspice.h"
+
+/*05.June.2020 - BM - Added follwing includes for Windows OS */
+#ifdef _WIN32
+ #undef BOOLEAN /* Undefine it due to conflicting definitions in Windows OS */
+
+ #include <ws2tcpip.h>
+ #include <winsock2.h>
+#endif
+
#include "ngspice/cpdefs.h"
#include "ngspice/ftedefs.h"
#include "ngspice/dvec.h"
@@ -45,11 +57,12 @@ Modified: 2000 AlansFixes, 2013/2015 patch by Krzysztof Blaszkowski
#include <errno.h>
/* 27.May.2020 - BM - Added the following #include */
-#include <stdio.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <unistd.h>
-
+#ifdef __linux__
+ #include <stdio.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <unistd.h>
+#endif
extern char *spice_analysis_get_name(int index);
extern char *spice_analysis_get_description(int index);
@@ -96,10 +109,8 @@ extern bool orflag;
int fixme_onoise_type = SV_NOTYPE;
int fixme_inoise_type = SV_NOTYPE;
-
#define DOUBLE_PRECISION 15
-
static clock_t lastclock, currclock;
static double *rowbuf;
static size_t column, rowbuflen;
@@ -119,7 +130,16 @@ static void close_server()
{
FILE *fptr;
char ip_filename[48];
- sprintf(ip_filename, "/tmp/NGHDL_COMMON_IP_%d.txt", getpid());
+
+ #ifdef __linux__
+ sprintf(ip_filename, "/tmp/NGHDL_COMMON_IP_%d.txt", getpid());
+ #elif _WIN32
+ WSADATA WSAData;
+ SOCKADDR_IN addr;
+ WSAStartup(MAKEWORD(2, 2), &WSAData);
+ sprintf(ip_filename, "C:\\Windows\\Temp\\NGHDL_COMMON_IP_%d.txt", getpid());
+ #endif
+
fptr = fopen(ip_filename, "r");
if(fptr)
@@ -178,11 +198,20 @@ static void close_server()
continue;
/* send close message to the server */
- send(sock, message, strlen(message), 0);
- close(sock);
+ #ifdef __linux__
+ send(sock, message, strlen(message), 0);
+ close(sock);
+ #elif _WIN32
+ send(sock, message, strlen(message) + 1, 0);
+ closesocket(sock);
+ #endif
}
}
+ #ifdef _WIN32
+ WSACleanup();
+ #endif
+ fclose(fptr);
remove(ip_filename);
}
@@ -233,7 +262,7 @@ beginPlot(JOB *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analNam
int i, j, depind = 0;
char namebuf[BSIZE_SP], parambuf[BSIZE_SP], depbuf[BSIZE_SP];
char *ch, tmpname[BSIZE_SP];
- bool saveall = TRUE;
+ bool saveall = TRUE;
bool savealli = FALSE;
char *an_name;
int initmem;
@@ -335,7 +364,6 @@ beginPlot(JOB *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analNam
run->refIndex = -1;
}
-
/* Pass 1. */
if (numsaves && !saveall) {
for (i = 0; i < numsaves; i++)
@@ -419,7 +447,6 @@ beginPlot(JOB *analysisPtr, CKTcircuit *circuitPtr, char *cktName, char *analNam
}
}
-
/* Pass 2. */
for (i = 0; i < numsaves; i++) {
@@ -606,10 +633,10 @@ OUTpD_memory(runDesc *run, IFvalue *refValue, IFvalue *valuePtr)
dataDesc *d;
-#ifdef TCL_MODULE
+ #ifdef TCL_MODULE
/*Locks the blt vector to stop access*/
blt_lockvec(i);
-#endif
+ #endif
d = &run->data[i];
@@ -638,10 +665,10 @@ OUTpD_memory(runDesc *run, IFvalue *refValue, IFvalue *valuePtr)
fprintf(stderr, "OUTpData: unsupported data type\n");
}
-#ifdef TCL_MODULE
+ #ifdef TCL_MODULE
/*relinks and unlocks vector*/
blt_relink(i, d->vec);
-#endif
+ #endif
}
}
@@ -1278,7 +1305,6 @@ plotEnd(runDesc *run)
close_server();
/* End 28.May.2020 */
-
fprintf(stdout, "\nNo. of Data Rows : %d\n", run->pointCount);
}
generated by cgit (git 2.34.1) at 2024-12-19 14:49:33 +0000