Check-in [f66e6ba3e8]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Correct offsets for the Jar and Pack for the dual-pool.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: f66e6ba3e8db6a6140814797501c8388c6a7fb58
User & Date: stephanie.gawroriski 2019-07-20 11:07:49
Context
2019-07-20
11:37
Base determine of pool type and if it should go in the pool. check-in: 2be98b73af user: stephanie.gawroriski tags: trunk
11:07
Correct offsets for the Jar and Pack for the dual-pool. check-in: f66e6ba3e8 user: stephanie.gawroriski tags: trunk
2019-07-18
07:02
Backup developer notes. check-in: c86ede7865 user: squirreljme tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to runt/libs/tool-jarfile/dev/shadowtail/jarfile/JarMinimizer.java.

1415
1416
1417
1418
1419
1420
1421

1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
		else if (this.owndualpool)
		{
			// Round for the pools
			while (((reloff + jdos.size()) & 3) != 0)
				jdos.write(0);
			
			// Encode the pool

			DualPoolEncodeResult der = DualPoolEncoder.encode(dualpool, jdos);
			
			// Write where the pools were written
			__dos.writeInt(reloff + der.staticpooloff);
			__dos.writeInt(der.staticpoolsize);
			__dos.writeInt(reloff + der.runtimepooloff);
			__dos.writeInt(der.runtimepoolsize);
		}
		
		// We are using the global pack pool, so set special indicators
		// that we are doing as such! The minimized class will use special
		// a special aliased pool for the pack file.
		else







>



|

|







1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
		else if (this.owndualpool)
		{
			// Round for the pools
			while (((reloff + jdos.size()) & 3) != 0)
				jdos.write(0);
			
			// Encode the pool
			int basep = reloff + jdos.size();
			DualPoolEncodeResult der = DualPoolEncoder.encode(dualpool, jdos);
			
			// Write where the pools were written
			__dos.writeInt(basep + der.staticpooloff);
			__dos.writeInt(der.staticpoolsize);
			__dos.writeInt(basep + der.runtimepooloff);
			__dos.writeInt(der.runtimepoolsize);
		}
		
		// We are using the global pack pool, so set special indicators
		// that we are doing as such! The minimized class will use special
		// a special aliased pool for the pack file.
		else

Changes to runt/libs/tool-packfile/dev/shadowtail/packfile/PackMinimizer.java.

257
258
259
260
261
262
263

264
265
266
267
268
269
270
271
272
273
274
275
276
277
		dos.writeInt(mainclassp);
		
		// Round for the pools
		while (((reloff + jdos.size()) & 3) != 0)
			jdos.write(0);
		
		// Encode the pool

		DualPoolEncodeResult der = DualPoolEncoder.encode(dualpool, jdos);
		
		// Write where the pools were written
		dos.writeInt(reloff + der.staticpooloff);
		dos.writeInt(der.staticpoolsize);
		dos.writeInt(reloff + der.runtimepooloff);
		dos.writeInt(der.runtimepoolsize);
		
		// Write TOC and JAR data
		taos.writeTo(dos);
		jaos.writeTo(dos);
	}
}








>



|

|








257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
		dos.writeInt(mainclassp);
		
		// Round for the pools
		while (((reloff + jdos.size()) & 3) != 0)
			jdos.write(0);
		
		// Encode the pool
		int basep = reloff + jdos.size();
		DualPoolEncodeResult der = DualPoolEncoder.encode(dualpool, jdos);
		
		// Write where the pools were written
		dos.writeInt(basep + der.staticpooloff);
		dos.writeInt(der.staticpoolsize);
		dos.writeInt(basep + der.runtimepooloff);
		dos.writeInt(der.runtimepoolsize);
		
		// Write TOC and JAR data
		taos.writeTo(dos);
		jaos.writeTo(dos);
	}
}