Merge pull request #11 from ambikeshwar1991/master

Changes for flexible client server port no.

6 files changed, 53 insertions, 13 deletions

diff --git a/Example/2-bit-inverter/2-bit-inverter.cir b/Example/2-bit-inverter/2-bit-inverter.cir
index 71794b2..88580dd 100644
--- a/Example/2-bit-inverter/2-bit-inverter.cir
+++ b/Example/2-bit-inverter/2-bit-inverter.cir
@@ -23,7 +23,7 @@ aconverter1 [100 200]  [1 2] adc_bridge1
 
 ainverter [1 2] [10 20]  inv1
 
-.model inv1 inverter(rise_delay = 1.0e-12 fall_delay = 1.0e-12 stop_time=90e-9)
+.model inv1 inverter(instance_id = 101 rise_delay = 1.0e-12 fall_delay = 1.0e-12 stop_time=90e-9)
 
 
 aconverter2 [10 20] [30 40] dac_bridge1
diff --git a/Example/xor/xor-test.cir b/Example/xor/xor-test.cir
index 7d13e58..910839e 100644
--- a/Example/xor/xor-test.cir
+++ b/Example/xor/xor-test.cir
@@ -24,7 +24,7 @@ axor [1] [2]  [12] axors
 adac1 [12] [34]  dac
 *************model***********
 
-.model axors myxor(rise_delay = 1.0e-10 fall_delay = 1.0e-10 stop_time=90n)
+.model axors myxor(instance_id = 112 rise_delay = 1.0e-10 fall_delay = 1.0e-10 stop_time=90n)
 
 .model adc adc_bridge ( in_low =0.5 in_high =1.0
 +                   rise_delay =1.0e-10 fall_delay =1.0e-10)
diff --git a/src/ghdlserver/Vhpi_Package.vhdl b/src/ghdlserver/Vhpi_Package.vhdl
index febc00b..0c0baac 100755
--- a/src/ghdlserver/Vhpi_Package.vhdl
+++ b/src/ghdlserver/Vhpi_Package.vhdl
@@ -8,7 +8,7 @@ package Vhpi_Foreign is
   -----------------------------------------------------------------------------
   -- foreign Vhpi function
   -----------------------------------------------------------------------------
-  procedure  Vhpi_Initialize;
+  procedure  Vhpi_Initialize(sock_port : in integer);
   attribute foreign of Vhpi_Initialize : procedure is "VHPIDIRECT Vhpi_Initialize";
   
   procedure Vhpi_Close; -- close .
@@ -36,7 +36,7 @@ package body Vhpi_Foreign is
   -----------------------------------------------------------------------------
   -- subprogram bodies for foreign vhpi routines.  will never be called
   -----------------------------------------------------------------------------
-  procedure  Vhpi_Initialize is
+  procedure  Vhpi_Initialize(sock_port: in integer) is
   begin
     assert false  report "fatal: this should never be called" severity failure;
   end Vhpi_Initialize;
diff --git a/src/ghdlserver/ghdlserver.c b/src/ghdlserver/ghdlserver.c
index 68c9941..603f925 100644
--- a/src/ghdlserver/ghdlserver.c
+++ b/src/ghdlserver/ghdlserver.c
@@ -369,9 +369,9 @@ void set_non_blocking(int sock_id)
 } 
 
 
-void Vhpi_Initialize()
+void Vhpi_Initialize(int sock_port)
 {
-   
+    DEFAULT_SERVER_PORT = sock_port;
     /*Taking time info for log*/ 
     time_t systime;                                                             
     systime = time(NULL);  
diff --git a/src/ghdlserver/ghdlserver.h b/src/ghdlserver/ghdlserver.h
index 07cccb6..ad82385 100644
--- a/src/ghdlserver/ghdlserver.h
+++ b/src/ghdlserver/ghdlserver.h
@@ -13,7 +13,6 @@
 #define MAX_BUF_SIZE 4096
 
 //Defualt port number
-#define DEFAULT_SERVER_PORT  5000
 
 //unlikely to have more than 16 active
 //threads talking to the TB?
@@ -22,6 +21,8 @@
 
 
 
+int DEFAULT_SERVER_PORT;
+
 //Payload Handling
 int extract_payload(char* receive_buffer,char* payload, int max_n);
 //void print_payload(FILE* log_file,char* send_buffer, int wlength, int nwords);
@@ -47,7 +48,7 @@ void set_non_blocking(int sock_id);
 void Data_Send(int sockid);
 
 //Vhpi Function
-void   Vhpi_Initialize();                                                     
+void   Vhpi_Initialize(int sock_port);                                                     
 void   Vhpi_Close(); 
 void   Vhpi_Listen();
 void   Vhpi_Send();
diff --git a/src/model_generation.py b/src/model_generation.py
index c5350c0..2c7a050 100755
--- a/src/model_generation.py
+++ b/src/model_generation.py
@@ -170,7 +170,8 @@ var_section='''
     char *key_iter;
     struct hostent *host;                                                                                                                      
     struct sockaddr_in server_addr;                                                                                                            
-    double time_limit = PARAM(stop_time);   
+    double time_limit = PARAM(stop_time);
+    int sock_port = 5000+PARAM(instance_id);
 '''
 temp_input_var=[]
 for item in input_port:
@@ -247,7 +248,7 @@ create_socket='''
 
         // memset(&server_addr, 0, sizeof(server_addr));                                                                                       
         server_addr.sin_family = AF_INET;                                                                                                      
-        server_addr.sin_port = htons(5000);                                                                                                    
+        server_addr.sin_port = htons(sock_port);                                                                                                    
         server_addr.sin_addr = *((struct in_addr *)host->h_addr);                                                                              
         bzero(&(server_addr.sin_zero),8);                                                                                                      
 
@@ -462,7 +463,8 @@ for item in cm_event_get_ptr:
     cfunc.write("\n")
 cfunc.write(systime_info)
 cfunc.write("\n")
-cfunc.write('\t\tsystem("'+home+'/ngspice-26/src/xspice/icm/ghdl/'+fname.split('.')[0]+'/DUTghdl/start_server.sh &");\n')
+cfunc.write('\t\tsnprintf(command,1024,"'+home+'/ngspice-26/src/xspice/icm/ghdl/'+fname.split('.')[0]+'/DUTghdl/start_server.sh %d &",sock_port);\n')
+cfunc.write('\t\tsystem(command)')
 cfunc.write("\t}")
 cfunc.write("\n")
 cfunc.write("\telse\n\t{\n")
@@ -554,6 +556,17 @@ for item in output_port:
     in_port_table.append(port_table+port_name+description+direction+default_type+allowed_type+vector+vector_bounds+null_allowed)
 
 parameter_table='''
+
+PARAMETER_TABLE:
+Parameter_Name:     instance_id
+Description:        "instance_id"
+Data_Type:          real
+Default_Value:      0
+Limits:             -
+Vector:              no
+Vector_Bounds:       -
+Null_Allowed:       yes
+
 PARAMETER_TABLE:                                                                                                                               
 Parameter_Name:     rise_delay                  fall_delay                                                                                     
 Description:        "rise delay"                "fall delay"                                                                                   
@@ -608,6 +621,7 @@ use ieee.numeric_std.all;
 library work;                                                                                                                                   
 use work.Vhpi_Foreign.all;                                                                                                                      
 use work.Utility_Package.all;
+use work.sock_pkg.all;
 
 
 '''
@@ -677,7 +691,7 @@ map.append("\t\t\t);")
 tb_clk= "clk_s <= not clk_s after 5 us;\n\n"
 #Adding Process block for Vhpi
 process_Vhpi=[]
-process_Vhpi.append("\tprocess\n\n\t\tbegin\n\n\t\tVhpi_Initialize;\n\t\twait until clk_s = '1';\n\t\twhile true loop\n\t\t\twait until clk_s = '0';\n\t\t\tVhpi_Listen;\n\t\t\twait for 1 us;\n\t\t\tVhpi_Send;\n\t\tend loop;\n\t\twait;\n\tend process;\n\n")
+process_Vhpi.append("\tprocess\n\t\tvariable sock_port : integer;\n\t\tbegin\n\t\tsock_port := sock_pkg_fun;\n\t\tVhpi_Initialize(sock_port);\n\t\twait until clk_s = '1';\n\t\twhile true loop\n\t\t\twait until clk_s = '0';\n\t\t\tVhpi_Listen;\n\t\t\twait for 1 us;\n\t\t\tVhpi_Send;\n\t\tend loop;\n\t\twait;\n\tend process;\n\n")
 #Adding process block 
 process=[]
 process.append("\tprocess\n\n")
@@ -743,7 +757,7 @@ for item in process:
 
 testbench.close()
 
-#####################################Creating and writing components in start_server.sh ################################
+##################################### Creating and writing components in start_server.sh ################################
 
 start_server = open('start_server.sh','w')
 
@@ -753,9 +767,34 @@ start_server.write("#gcc -c ghdlserver.c\n")
 start_server.write("#ghdl -a Utility_Package.vhdl &&\n")
 start_server.write("#ghdl -a Vhpi_Package.vhdl &&\n")
 start_server.write("cd "+home+"/ngspice-26/src/xspice/icm/ghdl/"+fname.split('.')[0]+"/DUTghdl/\n")
+start_server.write("./sock_pkg_create.sh &&\n")
+start_server.write("ghdl -a sock_pkg.vhdl &&\n")
 start_server.write("ghdl -a "+fname+" &&\n")
 start_server.write("ghdl -a "+fname.split('.')[0]+"_tb.vhdl  &&\n")
 start_server.write("ghdl -e -Wl,ghdlserver.o "+fname.split('.')[0]+"_tb &&\n")
 start_server.write("./"+fname.split('.')[0]+"_tb")
 
 start_server.close()
+
+##################################### Creating and writing in sock_pkg_create.sh ########################################
+
+sock_pkg_create = open('sock_pkg_create.sh','w')
+
+sock_pkg_create.write("echo \"#!/bin/bash\n\n")
+sock_pkg_create.write("###This file create sock_pkg_create.vhdl file and set the instance id from parameter based on parameter\n\n")
+sock_pkg_create.write("library ieee;\n")
+sock_pkg_create.write("package sock_pkg is\n")
+sock_pkg_create.write("\tfunction sock_pkg_fun return integer;\n")
+sock_pkg_create.write("end;\n\n")
+sock_pkg_create.write("\tpackage body sock_pkg is\n")
+sock_pkg_create.write("\t\tvariable sock_id : integer;\n")
+sock_pkg_create.write("\t\t\tbegin\n")
+sock_pkg_create.write("\t\t\t\tsock_id := $1;\n")
+sock_pkg_create.write("\t\t\t\treturn sock_id;\n")
+sock_pkg_create.write("\t\t\tend function;\n")
+sock_pkg_create.write("\t\tend package body;\" > sock_pkg.vhdl")
+
+
+
+
+