| 
						
						
							
								
							
						
						
					 | 
				
			
			 | 
			 | 
			
				@ -76,6 +76,8 @@ public class import_df_structures extends GhidraScript
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
					{
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						if (target == null)
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
							target = DataType.DEFAULT;
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						if (BooleanDataType.dataType.isEquivalent(target))
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
							target = dtInt8;
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						var ptr = dtm.getPointer(target, currentProgram.getDefaultPointerSize());
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						var name = "vector<" + target.getName() + ">";
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
				
 | 
			
		
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
			
			 | 
			 | 
			
				@ -1192,9 +1194,13 @@ public class import_df_structures extends GhidraScript
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
					private void labelVTables() throws Exception
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
					{
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						updateProgressMajor("Labelling vtables...");
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						monitor.initialize(symbolTable.vtables.size());
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
				
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						int i = 0;
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						for (var vt : symbolTable.vtables)
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						{
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
							monitor.setProgress(i++);
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
				
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
							if (!vt.hasName)
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
								continue;
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
				
 | 
			
		
		
	
	
		
			
				
					| 
						
							
								
							
						
						
							
								
							
						
						
					 | 
				
			
			 | 
			 | 
			
				@ -1224,6 +1230,7 @@ public class import_df_structures extends GhidraScript
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
					private void labelGlobals() throws Exception
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
					{
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						updateProgressMajor("Labelling globals...");
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						monitor.initialize(codegen.globals.size());
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
				
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						var addrs = new HashMap<String, Address>();
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
				
 | 
			
		
		
	
	
		
			
				
					| 
						
						
						
							
								
							
						
					 | 
				
			
			 | 
			 | 
			
				@ -1237,8 +1244,11 @@ public class import_df_structures extends GhidraScript
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
							addrs.put(g.name, toAddr(g.value));
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						}
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
				
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						int i = 0;
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						for (var gobj : codegen.globals)
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
						{
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
							monitor.setProgress(i++);
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
				
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
							if (!gobj.hasName)
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
								continue;
 | 
			
		
		
	
		
			
				 | 
				 | 
			
			 | 
			 | 
			
							if (!addrs.containsKey(gobj.name))
 | 
			
		
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
			
			 | 
			 | 
			
				
 
 |